From e1d8f598905eb60291dfe9fd814781b228850497 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Tue, 10 Sep 2024 21:11:15 +0900 Subject: [PATCH] [Refactor] Change the function names. --- src-ui/app/config_page/ConfigPage.jsx | 2 +- .../setting_box/SettingBox.jsx | 4 +- .../setting_box/about_vrct/AboutVrct.jsx | 6 +- .../PosterShowcaseWorldsContents.jsx | 6 +- .../posters_contents/PostersContents.jsx | 10 +-- .../setting_box/appearance/Appearance.jsx | 6 +- .../components/dropdown_menu/DropdownMenu.jsx | 4 +- .../message_format/MessageFormat.jsx | 22 +++--- .../slider_and_meter/SliderAndMeter.jsx | 8 +- .../setting_box/components/useSettingBox.jsx | 4 +- .../components/word_filter/WordFilter.jsx | 10 +-- .../setting_box/others/Others.jsx | 2 +- .../sidebar_section/SidebarSection.jsx | 4 +- src-ui/app/config_page/topbar/Topbar.jsx | 4 +- .../section_title_box/SectionTitleBox.jsx | 4 +- src-ui/app/main_page/MainPage.jsx | 4 +- .../main_page/main_section/MainSection.jsx | 4 +- .../LanguageSelectorTopBar.jsx | 4 +- .../message_container/log_box/LogBox.jsx | 8 +- .../message_input_box/MessageInputBox.jsx | 3 +- .../SidebarCompactModeButton.jsx | 8 +- .../sidebar_section/SidebarSection.jsx | 8 +- .../language_settings/LanguageSettings.jsx | 8 +- .../preset_tab_selector/PresetTabSelector.jsx | 8 +- .../TranslatorSelectorOpenButton.jsx | 12 +-- .../TranslatorSelector.jsx | 14 ++-- .../main_page/sidebar_section/logo/Logo.jsx | 6 +- .../MainFunctionSwitch.jsx | 6 +- .../open_settings/OpenSettings.jsx | 4 +- .../configs/useEnableAutoClearMessageBox.js | 8 +- src-ui/logics/configs/useMicDeviceList.js | 10 ++- src-ui/logics/configs/useMicHostList.js | 10 ++- src-ui/logics/configs/useMicThreshold.js | 11 ++- src-ui/logics/configs/useSelectedMicDevice.js | 11 ++- src-ui/logics/configs/useSelectedMicHost.js | 11 ++- .../configs/useSelectedSpeakerDevice.js | 11 ++- .../configs/useSendMessageButtonType.js | 8 +- src-ui/logics/configs/useSoftwareVersion.js | 10 ++- src-ui/logics/configs/useSpeakerDeviceList.js | 10 ++- src-ui/logics/configs/useSpeakerThreshold.js | 11 ++- src-ui/logics/useMainFunction.js | 16 ++-- src-ui/logics/useMessage.js | 14 ++-- src-ui/logics/useVolume.js | 8 +- src-ui/logics/useWindow.js | 4 +- src-ui/store.js | 75 +++++++++---------- 45 files changed, 230 insertions(+), 191 deletions(-) diff --git a/src-ui/app/config_page/ConfigPage.jsx b/src-ui/app/config_page/ConfigPage.jsx index 2756e520..8c679d0f 100644 --- a/src-ui/app/config_page/ConfigPage.jsx +++ b/src-ui/app/config_page/ConfigPage.jsx @@ -4,7 +4,7 @@ import { Topbar } from "./topbar/Topbar.jsx"; import { SidebarSection } from "./sidebar_section/SidebarSection.jsx"; import { SettingSection } from "./setting_section/SettingSection.jsx"; -import { useSoftwareVersion } from "@store"; +import { useSoftwareVersion } from "@logics_configs/useSoftwareVersion"; import { useTranslation } from "react-i18next"; export const ConfigPage = () => { diff --git a/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx b/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx index 2969622e..4e9dbb04 100644 --- a/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx @@ -1,4 +1,4 @@ -import { useSelectedConfigTabId } from "@store"; +import { useStore_SelectedConfigTabId } from "@store"; import { Device } from "./device/Device"; import { Appearance } from "./appearance/Appearance"; @@ -6,7 +6,7 @@ import { Appearance } from "./appearance/Appearance"; // import { AboutVrct } from "./about_vrct/AboutVrct"; export const SettingBox = () => { - const { currentSelectedConfigTabId } = useSelectedConfigTabId(); + const { currentSelectedConfigTabId } = useStore_SelectedConfigTabId(); switch (currentSelectedConfigTabId) { case "device": return ; diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx b/src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx index 201e9c1c..a00f0424 100644 --- a/src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx @@ -19,12 +19,12 @@ import vrchat_disclaimer from "@images/about_vrct/vrchat_disclaimer.png"; import clsx from "clsx"; import { useTranslation } from "react-i18next"; -import { useUiLanguageStatus } from "@store"; +import { useStore_UiLanguage } from "@store"; import { PosterShowcaseContents } from "./poster_showcase_contents/PosterShowcaseContents"; export const AboutVrct = () => { const { t } = useTranslation(); - const { currentUiLanguageStatus } = useUiLanguageStatus(); + const { currentUiLanguage } = useStore_UiLanguage(); return (
@@ -74,7 +74,7 @@ export const AboutVrct = () => { { - currentUiLanguageStatus === "ja" + currentUiLanguage === "ja" ? : } diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx b/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx index e18b27e3..1863b42b 100644 --- a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx @@ -1,6 +1,6 @@ import clsx from "clsx"; import styles from "./PosterShowcaseWorldsContents.module.scss"; -import { usePosterShowcaseWorldPageIndex } from "@store"; +import { useStore_PosterShowcaseWorldPageIndex } from "@store"; const images = import.meta.glob("@images/about_vrct/showcased_worlds/*.{png,jpg,jpeg,svg}", { eager: true }); const getImageByFileName = (file_name) => { @@ -12,7 +12,7 @@ import poster_showcase_worlds_settings from "./poster_showcase_worlds_settings"; import { chunkArray } from "@utils/chunkArray"; export const PosterShowcaseWorldsContents = () => { - const { currentPosterShowcaseWorldPageIndex } = usePosterShowcaseWorldPageIndex(); + const { currentPosterShowcaseWorldPageIndex } = useStore_PosterShowcaseWorldPageIndex(); const poster_showcase_world_images = poster_showcase_worlds_settings.map((setting) => ({ img: getImageByFileName(setting.image_file_name), x_post_num: setting.x_post_num @@ -59,7 +59,7 @@ import chat_white_square from "@images/chato_white_square.png"; import { useEffect } from "react"; import { randomIntMinMax } from "@utils/randomIntMinMax"; const PosterShowcaseWorldsPagination = ({ page_length }) => { - const { currentPosterShowcaseWorldPageIndex, updatePosterShowcaseWorldPageIndex } = usePosterShowcaseWorldPageIndex(); + const { currentPosterShowcaseWorldPageIndex, updatePosterShowcaseWorldPageIndex } = useStore_PosterShowcaseWorldPageIndex(); useEffect(() => { updatePosterShowcaseWorldPageIndex(randomIntMinMax(page_length -1)); diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx b/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx index 575a874c..886f40a3 100644 --- a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx @@ -1,8 +1,8 @@ import clsx from "clsx"; import styles from "./PostersContents.module.scss"; -import { useUiLanguageStatus } from "@store"; +import { useStore_UiLanguage } from "@store"; -import { useVrctPosterIndex } from "@store"; +import { useStore_VrctPosterIndex } from "@store"; import ArrowLeftSvg from "@images/arrow_left.svg?react"; import iya_vrct_poster_ja from "@images/about_vrct/vrct_posters/iya_vrct_poster_ja.png"; @@ -29,8 +29,8 @@ import poster_images_authors_m_ja from "@images/about_vrct/vrct_posters/authors/ import poster_images_authors_m_en from "@images/about_vrct/vrct_posters/authors/poster_images_authors_m_en.png"; export const PostersContents = () => { - const { currentVrctPosterIndex, updateVrctPosterIndex } = useVrctPosterIndex(); - const { currentUiLanguageStatus } = useUiLanguageStatus(); + const { currentVrctPosterIndex, updateVrctPosterIndex } = useStore_VrctPosterIndex(); + const { currentUiLanguage } = useStore_UiLanguage(); const updateIndex = (delta) => { @@ -60,7 +60,7 @@ export const PostersContents = () => {
{ - currentUiLanguageStatus === "ja" + currentUiLanguage === "ja" ? : } 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 fe89e3c6..33f96c08 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,11 @@ import { useTranslation } from "react-i18next"; import FolderOpenSvg from "@images/folder_open.svg?react"; import { useSettingBox } from "../components/useSettingBox"; -import { useSelectedMicDevice, useMicDeviceList } from "@store"; +import { useStore_SelectedMicDevice, useStore_MicDeviceList } from "@store"; export const Appearance = () => { const { t } = useTranslation(); - const { currentSelectedMicDevice, updateSelectedMicDevice } = useSelectedMicDevice(); - const { currentMicDeviceList } = useMicDeviceList(); + const { currentSelectedMicDevice, updateSelectedMicDevice } = useStore_SelectedMicDevice(); + const { currentMicDeviceList } = useStore_MicDeviceList(); const { DropdownMenuContainer, SliderContainer, diff --git a/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx b/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx index 8e34ffad..4194fc15 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx @@ -1,10 +1,10 @@ import styles from "./DropdownMenu.module.scss"; import clsx from "clsx"; import ArrowLeftSvg from "@images/arrow_left.svg?react"; -import { useIsOpenedDropdownMenu } from "@store"; +import { useStore_IsOpenedDropdownMenu } from "@store"; export const DropdownMenu = (props) => { - const { updateIsOpenedDropdownMenu, currentIsOpenedDropdownMenu } = useIsOpenedDropdownMenu(); + const { updateIsOpenedDropdownMenu, currentIsOpenedDropdownMenu } = useStore_IsOpenedDropdownMenu(); const toggleDropdownMenu = () => { if (currentIsOpenedDropdownMenu === props.dropdown_id) { diff --git a/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx b/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx index d3d38eca..9e9e13db 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/components/message_format/MessageFormat.jsx @@ -1,20 +1,20 @@ import styles from "./MessageFormat.module.scss"; import { useTranslation } from "react-i18next"; import { - useUiLanguageStatus, - useSendMessageFormat, - useSendMessageFormatWithT, - useReceivedMessageFormat, - useReceivedMessageFormatWithT, + useStore_UiLanguage, + useStore_SendMessageFormat, + useStore_SendMessageFormatWithT, + useStore_ReceivedMessageFormat, + useStore_ReceivedMessageFormatWithT, } from "@store"; import { _Entry } from "../_atoms/_entry/_Entry"; import SwapImg from "@images/swap_icon.png"; export const MessageFormat = (props) => { - const { currentSendMessageFormat, updateSendMessageFormat } = useSendMessageFormat(); - const { currentSendMessageFormatWithT, updateSendMessageFormatWithT } = useSendMessageFormatWithT(); - const { currentReceivedMessageFormat, updateReceivedMessageFormat } = useReceivedMessageFormat(); - const { currentReceivedMessageFormatWithT, updateReceivedMessageFormatWithT } = useReceivedMessageFormatWithT(); + const { currentSendMessageFormat, updateSendMessageFormat } = useStore_SendMessageFormat(); + const { currentSendMessageFormatWithT, updateSendMessageFormatWithT } = useStore_SendMessageFormatWithT(); + const { currentReceivedMessageFormat, updateReceivedMessageFormat } = useStore_ReceivedMessageFormat(); + const { currentReceivedMessageFormatWithT, updateReceivedMessageFormatWithT } = useStore_ReceivedMessageFormatWithT(); let atoms = []; switch (props.id) { @@ -49,14 +49,14 @@ export const MessageFormat = (props) => { const ExampleComponent = ({ id, current_format }) => { const { t } = useTranslation(); - const { currentUiLanguageStatus } = useUiLanguageStatus(); + const { currentUiLanguage } = useStore_UiLanguage(); const createExampleMessage = () => { const originalLangMessage = t("config_page.send_message_format.example_text"); let format = current_format; if (["send_with_t", "received_with_t"].includes(id)) { - const translationLocale = currentUiLanguageStatus === "en" ? "ja" : "en"; + const translationLocale = currentUiLanguage === "en" ? "ja" : "en"; const translatedLangMessage = t("config_page.send_message_format.example_text", { lng: translationLocale }); return format.is_message_first 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 e22ab890..acb84acd 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 @@ -1,8 +1,8 @@ import { useState } from "react"; import styles from "./SliderAndMeter.module.scss"; import { - useMicVolume, - useSpeakerVolume, + useStore_MicVolume, + useStore_SpeakerVolume, } from "@store"; import { useVolume } from "@logics/useVolume"; @@ -23,7 +23,7 @@ export const SliderAndMeter = (props) => { const ThresholdVolumeMeter_Mic = (props) => { - const { currentMicVolume } = useMicVolume(); + const { currentMicVolume } = useStore_MicVolume(); const currentVolumeVariable = Math.min(currentMicVolume.data, props.max); const volume_width_percentage = (currentVolumeVariable / props.max) * 100; @@ -46,7 +46,7 @@ const ThresholdVolumeMeter_Mic = (props) => { const ThresholdVolumeMeter_Speaker = (props) => { - const { currentSpeakerVolume } = useSpeakerVolume(); + const { currentSpeakerVolume } = useStore_SpeakerVolume(); const currentVolumeVariable = Math.min(currentSpeakerVolume.data, props.max); const volume_width_percentage = (currentVolumeVariable / props.max) * 100; diff --git a/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx b/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx index 5c1dc118..03df067f 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx @@ -1,5 +1,5 @@ import styles from "./useSettingBox.module.scss"; -import { useIsOpenedDropdownMenu } from "@store"; +import { useStore_IsOpenedDropdownMenu } from "@store"; import clsx from "clsx"; import { LabelComponent } from "./label_component/LabelComponent"; @@ -17,7 +17,7 @@ import { WordFilter, WordFilterListToggleComponent } from "./word_filter/WordFil const useOnMouseLeaveDropdownMenu = () => { - const { updateIsOpenedDropdownMenu } = useIsOpenedDropdownMenu(); + const { updateIsOpenedDropdownMenu } = useStore_IsOpenedDropdownMenu(); const onMouseLeaveFunction = () => { updateIsOpenedDropdownMenu(""); diff --git a/src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.jsx b/src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.jsx index 49b54c11..4fc3b70e 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.jsx @@ -1,11 +1,11 @@ import styles from "./WordFilter.module.scss"; import { _Entry } from "../_atoms/_entry/_Entry"; import { useState } from "react"; -import { useWordFilterList, useIsOpenedWordFilterList } from "@store"; +import { useStore_WordFilterList, useStore_IsOpenedWordFilterList } from "@store"; export const WordFilter = () => { const [input_value, setInputValue] = useState(); - const { currentWordFilterList, updateWordFilterList } = useWordFilterList(); - const { currentIsOpenedWordFilterList, updateIsOpenedWordFilterList } = useIsOpenedWordFilterList(); + const { currentWordFilterList, updateWordFilterList } = useStore_WordFilterList(); + const { currentIsOpenedWordFilterList, updateIsOpenedWordFilterList } = useStore_IsOpenedWordFilterList(); const onChangeEntry = (e) => { setInputValue(e.target.value); @@ -112,8 +112,8 @@ import { useTranslation } from "react-i18next"; import ArrowLeftSvg from "@images/arrow_left.svg?react"; export const WordFilterListToggleComponent = (props) => { const { t } = useTranslation(); - const { currentIsOpenedWordFilterList, updateIsOpenedWordFilterList } = useIsOpenedWordFilterList(); - const { currentWordFilterList } = useWordFilterList(); + const { currentIsOpenedWordFilterList, updateIsOpenedWordFilterList } = useStore_IsOpenedWordFilterList(); + const { currentWordFilterList } = useStore_WordFilterList(); const svg_class_names = clsx(styles["arrow_left_svg"], { diff --git a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx b/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx index dabb27d1..09864c98 100644 --- a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx @@ -1,7 +1,7 @@ import { useTranslation } from "react-i18next"; import { useSettingBox } from "../components/useSettingBox"; // import { -// useEnableAutoClearMessageBox, +// useStore_EnableAutoClearMessageBox, // } from "@store"; import { useConfig } from "@logics/useConfig"; diff --git a/src-ui/app/config_page/sidebar_section/SidebarSection.jsx b/src-ui/app/config_page/sidebar_section/SidebarSection.jsx index e227989e..1003b00b 100644 --- a/src-ui/app/config_page/sidebar_section/SidebarSection.jsx +++ b/src-ui/app/config_page/sidebar_section/SidebarSection.jsx @@ -22,11 +22,11 @@ export const SidebarSection = () => { import clsx from "clsx"; import { useTranslation } from "react-i18next"; -import { useSelectedConfigTabId } from "@store"; +import { useStore_SelectedConfigTabId } from "@store"; const Tab = (props) => { const { t } = useTranslation(); - const { updateSelectedConfigTabId, currentSelectedConfigTabId } = useSelectedConfigTabId(); + const { updateSelectedConfigTabId, currentSelectedConfigTabId } = useStore_SelectedConfigTabId(); const onclickFunction = () => { updateSelectedConfigTabId(props.tab_id); }; diff --git a/src-ui/app/config_page/topbar/Topbar.jsx b/src-ui/app/config_page/topbar/Topbar.jsx index b9f88ebe..40824747 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 "@store"; +import { useStore_IsOpenedConfigPage } from "@store"; import ArrowLeftSvg from "@images/arrow_left.svg?react"; import { TitleBox } from "./title_box/TitleBox"; @@ -9,7 +9,7 @@ import { SectionTitleBox } from "./section_title_box/SectionTitleBox"; import { CompactSwitchBox } from "./compact_switch_box/CompactSwitchBox"; export const Topbar = () => { - const { currentIsOpenedConfigPage, updateIsOpenedConfigPage } = useIsOpenedConfigPage(); + const { currentIsOpenedConfigPage, updateIsOpenedConfigPage } = useStore_IsOpenedConfigPage(); const closeConfigPage = () => { updateIsOpenedConfigPage(false); }; diff --git a/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx b/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx index 7e313965..ff4d9292 100644 --- a/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx +++ b/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx @@ -1,10 +1,10 @@ import { useTranslation } from "react-i18next"; import styles from "./SectionTitleBox.module.scss"; -import { useSelectedConfigTabId } from "@store"; +import { useStore_SelectedConfigTabId } from "@store"; export const SectionTitleBox = () => { const { t } = useTranslation(); - const { currentSelectedConfigTabId } = useSelectedConfigTabId(); + const { currentSelectedConfigTabId } = useStore_SelectedConfigTabId(); return (

{t(`config_page.side_menu_labels.${currentSelectedConfigTabId}`)}

diff --git a/src-ui/app/main_page/MainPage.jsx b/src-ui/app/main_page/MainPage.jsx index 66ee6bba..037b53aa 100644 --- a/src-ui/app/main_page/MainPage.jsx +++ b/src-ui/app/main_page/MainPage.jsx @@ -2,10 +2,10 @@ 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 "@store"; +import { useStore_IsOpenedConfigPage } from "@store"; export const MainPage = () => { - const { currentIsOpenedConfigPage } = useIsOpenedConfigPage(); + const { currentIsOpenedConfigPage } = useStore_IsOpenedConfigPage(); return (
{ @@ -18,7 +18,7 @@ export const MainSection = () => { }; const HandleLanguageSelector = () => { - const { currentIsOpenedLanguageSelector } = useIsOpenedLanguageSelector(); + const { currentIsOpenedLanguageSelector } = useStore_IsOpenedLanguageSelector(); if (currentIsOpenedLanguageSelector.your_language === true) { return ; diff --git a/src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx b/src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx index d1eecc73..fba4ba89 100644 --- a/src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx +++ b/src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx @@ -1,9 +1,9 @@ import styles from "./LanguageSelectorTopBar.module.scss"; -import { useIsOpenedLanguageSelector } from "@store"; +import { useStore_IsOpenedLanguageSelector } from "@store"; export const LanguageSelectorTopBar = (props) => { - const { updateIsOpenedLanguageSelector } = useIsOpenedLanguageSelector(); + const { updateIsOpenedLanguageSelector } = useStore_IsOpenedLanguageSelector(); const closeLanguageSelector = () => { updateIsOpenedLanguageSelector({ 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 e6bdd07f..fb34148c 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 @@ -1,11 +1,11 @@ import { useEffect, useLayoutEffect, useRef, useState } from "react"; import styles from "./LogBox.module.scss"; -import { useMessageLogsStatus, store } from "@store"; +import { useStore_MessageLogs, store } from "@store"; import { MessageContainer } from "./message_container/MessageContainer"; import { scrollToBottom } from "@logics/scrollToBottom"; export const LogBox = () => { - const { currentMessageLogsStatus } = useMessageLogsStatus(); + const { currentMessageLogs } = useStore_MessageLogs(); const log_container_ref = useRef(null); const [is_scrolling, setIsScrolling] = useState(false); @@ -14,7 +14,7 @@ export const LogBox = () => { if (!is_scrolling) { scrollToBottom(store.log_box_ref, true); } - }, [currentMessageLogsStatus]); + }, [currentMessageLogs]); useEffect(() => { const handleScroll = () => { @@ -39,7 +39,7 @@ export const LogBox = () => { return (
- {currentMessageLogsStatus.map(message_data => ( + {currentMessageLogs.map(message_data => ( ))}
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 4c987dab..4e60b266 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 @@ -2,9 +2,10 @@ import { useState } from "react"; import styles from "./MessageInputBox.module.scss"; import SendMessageSvg from "@images/send_message.svg?react"; import { useMessage } from "@logics/useMessage"; -import { store, useEnableAutoClearMessageBox } from "@store"; +import { store } from "@store"; import { scrollToBottom } from "@logics/scrollToBottom"; import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonType"; +import { useEnableAutoClearMessageBox } from "@logics_configs/useEnableAutoClearMessageBox"; 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 889a0e6e..0ad2be9e 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,18 +1,18 @@ import clsx from "clsx"; import styles from "./SidebarCompactModeButton.module.scss"; -import { useMainPageCompactModeStatus } from "@store"; +import { useStore_IsMainPageCompactMode } from "@store"; import ArrowLeftSvg from "@images/arrow_left.svg?react"; export const SidebarCompactModeButton = () => { - const { updateMainPageCompactModeStatus, currentMainPageCompactModeStatus } = useMainPageCompactModeStatus(); + const { updateIsMainPageCompactMode, currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode(); const toggleCompactMode = () => { - updateMainPageCompactModeStatus(!currentMainPageCompactModeStatus); + updateIsMainPageCompactMode(!currentIsMainPageCompactMode); }; const class_names = clsx(styles["arrow_left_svg"], { - [styles["reverse"]]: currentMainPageCompactModeStatus + [styles["reverse"]]: currentIsMainPageCompactMode }); return ( diff --git a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx b/src-ui/app/main_page/sidebar_section/SidebarSection.jsx index 71d5ea4d..1d00ea55 100644 --- a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx +++ b/src-ui/app/main_page/sidebar_section/SidebarSection.jsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import styles from "./SidebarSection.module.scss"; -import { useMainPageCompactModeStatus } from "@store"; +import { useStore_IsMainPageCompactMode } from "@store"; import { Logo } from "./logo/Logo"; import { MainFunctionSwitch } from "./main_function_switch/MainFunctionSwitch"; @@ -9,16 +9,16 @@ import { LanguageSettings } from "./language_settings/LanguageSettings"; import { OpenSettings } from "./open_settings/OpenSettings"; export const SidebarSection = () => { - const { currentMainPageCompactModeStatus } = useMainPageCompactModeStatus(); + const { currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode(); const container_class_name = clsx(styles["container"], { - [styles["is_compact_mode"]]: currentMainPageCompactModeStatus + [styles["is_compact_mode"]]: currentIsMainPageCompactMode }); return (
- {!currentMainPageCompactModeStatus && } + {!currentIsMainPageCompactMode && }
); 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 18539e60..130b467b 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 @@ -6,10 +6,10 @@ import { PresetTabSelector } from "./preset_tab_selector/PresetTabSelector"; import { LanguageSelectorOpenButton } from "./language_selector_open_button/LanguageSelectorOpenButton"; import { LanguageSwapButton } from "./language_swap_button/LanguageSwapButton"; import { TranslatorSelectorOpenButton } from "./translator_selector_open_button/TranslatorSelectorOpenButton"; -import { useIsOpenedTranslatorSelector } from "@store"; +import { useStore_IsOpenedTranslatorSelector } from "@store"; export const LanguageSettings = () => { - const { updateIsOpenedTranslatorSelector} = useIsOpenedTranslatorSelector(); + const { updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const closeTranslatorSelector = () => updateIsOpenedTranslatorSelector(false); return ( @@ -24,12 +24,12 @@ export const LanguageSettings = () => { import MicSvg from "@images/mic.svg?react"; import HeadphonesSvg from "@images/headphones.svg?react"; -import { useIsOpenedLanguageSelector } from "@store"; +import { useStore_IsOpenedLanguageSelector } from "@store"; import { useMainFunction } from "@logics/useMainFunction"; const PresetContainer = () => { const { t } = useTranslation(); - const { updateIsOpenedLanguageSelector, currentIsOpenedLanguageSelector } = useIsOpenedLanguageSelector(); + const { updateIsOpenedLanguageSelector, currentIsOpenedLanguageSelector } = useStore_IsOpenedLanguageSelector(); const { currentTranscriptionSendStatus, 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 ec855226..9442ea60 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,16 +12,16 @@ export const PresetTabSelector = () => { import clsx from "clsx"; -import { useSelectedPresetTabStatus } from "@store"; +import { useStore_SelectedPresetTabNumber } from "@store"; const Tab = (props) => { - const { updateSelectedPresetTabStatus, currentSelectedPresetTabStatus } = useSelectedPresetTabStatus(); + const { updateSelectedPresetTabNumber, currentSelectedPresetTabNumber } = useStore_SelectedPresetTabNumber(); const onclickFunction = () => { - updateSelectedPresetTabStatus(props.preset_number); + updateSelectedPresetTabNumber(props.preset_number); }; const class_names = clsx(styles["tab_container"], { - [styles["is_selected"]]: (currentSelectedPresetTabStatus === props.preset_number) ? true : false + [styles["is_selected"]]: (currentSelectedPresetTabNumber === props.preset_number) ? true : false }); return ( 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 2be44a04..2a76b220 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 @@ -2,17 +2,17 @@ import { useTranslation } from "react-i18next"; import styles from "./TranslatorSelectorOpenButton.module.scss"; import { TranslatorSelector } from "./translator_selector/TranslatorSelector"; -import { useTranslatorListStatus, useSelectedTranslatorIdStatus, useIsOpenedTranslatorSelector } from "@store"; +import { useStore_TranslatorList, useStore_SelectedTranslatorId, useStore_IsOpenedTranslatorSelector } from "@store"; export const TranslatorSelectorOpenButton = () => { const { t } = useTranslation(); - const { currentSelectedTranslatorIdStatus } = useSelectedTranslatorIdStatus(); - const { currentTranslatorListStatus } = useTranslatorListStatus(); - const currentTranslator = currentTranslatorListStatus.find( - translator_data => translator_data.translator_key === currentSelectedTranslatorIdStatus + const { currentSelectedTranslatorId } = useStore_SelectedTranslatorId(); + const { currentTranslatorList } = useStore_TranslatorList(); + const currentTranslator = currentTranslatorList.find( + translator_data => translator_data.translator_key === currentSelectedTranslatorId ); - const { currentIsOpenedTranslatorSelector, updateIsOpenedTranslatorSelector} = useIsOpenedTranslatorSelector(); + const { currentIsOpenedTranslatorSelector, updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const openTranslatorSelector = () => updateIsOpenedTranslatorSelector(!currentIsOpenedTranslatorSelector); 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 4bff71ce..8cf654dd 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,10 +1,10 @@ import styles from "./TranslatorSelector.module.scss"; import { chunkArray } from "@utils/chunkArray"; -import { useTranslatorListStatus, useSelectedTranslatorIdStatus, useIsOpenedTranslatorSelector } from "@store"; +import { useStore_TranslatorList, useStore_SelectedTranslatorId, useStore_IsOpenedTranslatorSelector } from "@store"; export const TranslatorSelector = () => { - const { currentTranslatorListStatus } = useTranslatorListStatus(); - const columns = chunkArray(currentTranslatorListStatus, 2); + const { currentTranslatorList } = useStore_TranslatorList(); + const columns = chunkArray(currentTranslatorList, 2); return (
@@ -28,17 +28,17 @@ export const TranslatorSelector = () => { import clsx from "clsx"; const TranslatorBox = (props) => { - const { currentSelectedTranslatorIdStatus, updateSelectedTranslatorIdStatus} = useSelectedTranslatorIdStatus(); - const { updateIsOpenedTranslatorSelector} = useIsOpenedTranslatorSelector(); + const { currentSelectedTranslatorId, updateSelectedTranslatorId} = useStore_SelectedTranslatorId(); + const { updateIsOpenedTranslatorSelector} = useStore_IsOpenedTranslatorSelector(); const box_class_name = clsx( styles.box, - { [styles["is_selected"]]: (currentSelectedTranslatorIdStatus === props.translator_id) ? true : false }, + { [styles["is_selected"]]: (currentSelectedTranslatorId === props.translator_id) ? true : false }, { [styles["is_available"]]: (props.is_available === true) ? true : false } ); const selectTranslator = () => { - updateSelectedTranslatorIdStatus(props.translator_id); + updateSelectedTranslatorId(props.translator_id); updateIsOpenedTranslatorSelector(false); }; return ( 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 9bdae239..3c6ebf85 100644 --- a/src-ui/app/main_page/sidebar_section/logo/Logo.jsx +++ b/src-ui/app/main_page/sidebar_section/logo/Logo.jsx @@ -11,11 +11,11 @@ export const Logo = () => { import vrct_logo from "@images/vrct_logo_for_dark_mode.png"; import chato_img from "@images/chato_white.png"; -import { useMainPageCompactModeStatus } from "@store"; +import { useStore_IsMainPageCompactMode } from "@store"; export const LogoBox = () => { - const { currentMainPageCompactModeStatus } = useMainPageCompactModeStatus(); - if (currentMainPageCompactModeStatus === true) { + const { currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode(); + if (currentIsMainPageCompactMode === true) { return VRCT logo chato; } else { return VRCT logo; 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 b038ed0c..c39ee167 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,7 +5,7 @@ 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 { useMainPageCompactModeStatus } from "@store"; +import { useStore_IsMainPageCompactMode } from "@store"; import { useMainFunction } from "@logics/useMainFunction"; @@ -74,10 +74,10 @@ export const SwitchContainer = ({ switchLabel, switch_id, children, currentState const [is_hovered, setIsHovered] = useState(false); const [is_mouse_down, setIsMouseDown] = useState(false); - const { currentMainPageCompactModeStatus } = useMainPageCompactModeStatus(); + const { currentIsMainPageCompactMode } = useStore_IsMainPageCompactMode(); const getClassNames = (baseClass) => clsx(baseClass, { - [styles.is_compact_mode]: currentMainPageCompactModeStatus, + [styles.is_compact_mode]: currentIsMainPageCompactMode, [styles.is_active]: (currentState.data === true), [styles.is_loading]: (currentState.state === "loading"), [styles.is_hovered]: is_hovered, 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 92cc97fb..0c77e865 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,9 +1,9 @@ import styles from "./OpenSettings.module.scss"; -import { useIsOpenedConfigPage } from "@store"; +import { useStore_IsOpenedConfigPage } from "@store"; import ConfigurationSvg from "@images/configuration.svg?react"; export const OpenSettings = () => { - const { updateIsOpenedConfigPage } = useIsOpenedConfigPage(); + const { updateIsOpenedConfigPage } = useStore_IsOpenedConfigPage(); const openConfigPage = () => { updateIsOpenedConfigPage(true); diff --git a/src-ui/logics/configs/useEnableAutoClearMessageBox.js b/src-ui/logics/configs/useEnableAutoClearMessageBox.js index bd115357..44a45a8c 100644 --- a/src-ui/logics/configs/useEnableAutoClearMessageBox.js +++ b/src-ui/logics/configs/useEnableAutoClearMessageBox.js @@ -1,9 +1,9 @@ -import { useEnableAutoClearMessageBox as useStoreEnableAutoClearMessageBox } from "@store"; +import { useStore_EnableAutoClearMessageBox } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useEnableAutoClearMessageBox = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentEnableAutoClearMessageBox, updateEnableAutoClearMessageBox } = useStoreEnableAutoClearMessageBox(); + const { currentEnableAutoClearMessageBox, updateEnableAutoClearMessageBox } = useStore_EnableAutoClearMessageBox(); const getEnableAutoClearMessageBox = () => { updateEnableAutoClearMessageBox(() => new Promise(() => {})); @@ -20,9 +20,9 @@ export const useEnableAutoClearMessageBox = () => { }; return { + currentEnableAutoClearMessageBox, getEnableAutoClearMessageBox, toggleEnableAutoClearMessageBox, - currentEnableAutoClearMessageBox, - updateEnableAutoClearMessageBox + updateEnableAutoClearMessageBox, }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useMicDeviceList.js b/src-ui/logics/configs/useMicDeviceList.js index 201bcd19..ac2ad813 100644 --- a/src-ui/logics/configs/useMicDeviceList.js +++ b/src-ui/logics/configs/useMicDeviceList.js @@ -1,14 +1,18 @@ -import { useMicDeviceList as useStoreMicDeviceList } from "@store"; +import { useStore_MicDeviceList } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useMicDeviceList = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentMicDeviceList, updateMicDeviceList } = useStoreMicDeviceList(); + const { currentMicDeviceList, updateMicDeviceList } = useStore_MicDeviceList(); const getMicDeviceList = () => { updateMicDeviceList(() => new Promise(() => {})); asyncStdoutToPython("/controller/list_mic_device"); }; - return { currentMicDeviceList, getMicDeviceList, updateMicDeviceList }; + return { + currentMicDeviceList, + getMicDeviceList, + updateMicDeviceList, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useMicHostList.js b/src-ui/logics/configs/useMicHostList.js index 08a33be2..9dcd044c 100644 --- a/src-ui/logics/configs/useMicHostList.js +++ b/src-ui/logics/configs/useMicHostList.js @@ -1,14 +1,18 @@ -import { useMicHostList as useStoreMicHostList } from "@store"; +import { useStore_MicHostList } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useMicHostList = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentMicHostList, updateMicHostList } = useStoreMicHostList(); + const { currentMicHostList, updateMicHostList } = useStore_MicHostList(); const getMicHostList = () => { updateMicHostList(() => new Promise(() => {})); asyncStdoutToPython("/controller/list_mic_host"); }; - return { currentMicHostList, getMicHostList, updateMicHostList }; + return { + currentMicHostList, + getMicHostList, + updateMicHostList, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useMicThreshold.js b/src-ui/logics/configs/useMicThreshold.js index bdcc4b36..14b2a91c 100644 --- a/src-ui/logics/configs/useMicThreshold.js +++ b/src-ui/logics/configs/useMicThreshold.js @@ -1,9 +1,9 @@ -import { useMicThreshold as useStoreMicThreshold } from "@store"; +import { useStore_MicThreshold } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useMicThreshold = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { updateMicThreshold, currentMicThreshold } = useStoreMicThreshold(); + const { updateMicThreshold, currentMicThreshold } = useStore_MicThreshold(); const getMicThreshold = () => { asyncStdoutToPython("/config/input_mic_energy_threshold"); @@ -13,5 +13,10 @@ export const useMicThreshold = () => { asyncStdoutToPython("/controller/callback_set_mic_energy_threshold", mic_threshold); }; - return { getMicThreshold, setMicThreshold, currentMicThreshold, updateMicThreshold }; + return { + currentMicThreshold, + getMicThreshold, + setMicThreshold, + updateMicThreshold, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSelectedMicDevice.js b/src-ui/logics/configs/useSelectedMicDevice.js index 4e4eeb06..9eb9288c 100644 --- a/src-ui/logics/configs/useSelectedMicDevice.js +++ b/src-ui/logics/configs/useSelectedMicDevice.js @@ -1,9 +1,9 @@ -import { useSelectedMicDevice as useStoreSelectedMicDevice } from "@store"; +import { useStore_SelectedMicDevice } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSelectedMicDevice = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentSelectedMicDevice, updateSelectedMicDevice } = useStoreSelectedMicDevice(); + const { currentSelectedMicDevice, updateSelectedMicDevice } = useStore_SelectedMicDevice(); const getSelectedMicDevice = () => { updateSelectedMicDevice(() => new Promise(() => {})); @@ -15,5 +15,10 @@ export const useSelectedMicDevice = () => { asyncStdoutToPython("/controller/callback_set_mic_device", selected_mic_device); }; - return { currentSelectedMicDevice, getSelectedMicDevice, updateSelectedMicDevice, setSelectedMicDevice }; + return { + currentSelectedMicDevice, + getSelectedMicDevice, + updateSelectedMicDevice, + setSelectedMicDevice, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSelectedMicHost.js b/src-ui/logics/configs/useSelectedMicHost.js index 108a4ef3..ee624705 100644 --- a/src-ui/logics/configs/useSelectedMicHost.js +++ b/src-ui/logics/configs/useSelectedMicHost.js @@ -1,9 +1,9 @@ -import { useSelectedMicHost as useStoreSelectedMicHost } from "@store"; +import { useStore_SelectedMicHost } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSelectedMicHost = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentSelectedMicHost, updateSelectedMicHost } = useStoreSelectedMicHost(); + const { currentSelectedMicHost, updateSelectedMicHost } = useStore_SelectedMicHost(); const getSelectedMicHost = () => { updateSelectedMicHost(() => new Promise(() => {})); @@ -15,5 +15,10 @@ export const useSelectedMicHost = () => { asyncStdoutToPython("/controller/callback_set_mic_host", selected_mic_host); }; - return { currentSelectedMicHost, getSelectedMicHost, updateSelectedMicHost, setSelectedMicHost }; + return { + currentSelectedMicHost, + getSelectedMicHost, + updateSelectedMicHost, + setSelectedMicHost, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSelectedSpeakerDevice.js b/src-ui/logics/configs/useSelectedSpeakerDevice.js index 2437e55d..4bef87c0 100644 --- a/src-ui/logics/configs/useSelectedSpeakerDevice.js +++ b/src-ui/logics/configs/useSelectedSpeakerDevice.js @@ -1,9 +1,9 @@ -import { useSelectedSpeakerDevice as useStoreSelectedSpeakerDevice } from "@store"; +import { useStore_SelectedSpeakerDevice } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSelectedSpeakerDevice = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentSelectedSpeakerDevice, updateSelectedSpeakerDevice } = useStoreSelectedSpeakerDevice(); + const { currentSelectedSpeakerDevice, updateSelectedSpeakerDevice } = useStore_SelectedSpeakerDevice(); const getSelectedSpeakerDevice = () => { updateSelectedSpeakerDevice(() => new Promise(() => {})); @@ -15,5 +15,10 @@ export const useSelectedSpeakerDevice = () => { asyncStdoutToPython("/controller/callback_set_speaker_device", selected_speaker_device); }; - return { currentSelectedSpeakerDevice, getSelectedSpeakerDevice, updateSelectedSpeakerDevice, setSelectedSpeakerDevice }; + return { + currentSelectedSpeakerDevice, + getSelectedSpeakerDevice, + updateSelectedSpeakerDevice, + setSelectedSpeakerDevice, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSendMessageButtonType.js b/src-ui/logics/configs/useSendMessageButtonType.js index 479469fc..27d19ef8 100644 --- a/src-ui/logics/configs/useSendMessageButtonType.js +++ b/src-ui/logics/configs/useSendMessageButtonType.js @@ -1,9 +1,9 @@ -import { useSendMessageButtonType as useStoreSendMessageButtonType } from "@store"; +import { useStore_SendMessageButtonType } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSendMessageButtonType = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentSendMessageButtonType, updateSendMessageButtonType } = useStoreSendMessageButtonType(); + const { currentSendMessageButtonType, updateSendMessageButtonType } = useStore_SendMessageButtonType(); const getSendMessageButtonType = () => { updateSendMessageButtonType(() => new Promise(() => {})); @@ -16,9 +16,9 @@ export const useSendMessageButtonType = () => { }; return { + currentSendMessageButtonType, getSendMessageButtonType, setSendMessageButtonType, - currentSendMessageButtonType, - updateSendMessageButtonType + updateSendMessageButtonType, }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSoftwareVersion.js b/src-ui/logics/configs/useSoftwareVersion.js index f215084e..055184fa 100644 --- a/src-ui/logics/configs/useSoftwareVersion.js +++ b/src-ui/logics/configs/useSoftwareVersion.js @@ -1,14 +1,18 @@ -import { useSoftwareVersion as useStoreSoftwareVersion } from "@store"; +import { useStore_SoftwareVersion } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSoftwareVersion = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentSoftwareVersion, updateSoftwareVersion } = useStoreSoftwareVersion(); + const { currentSoftwareVersion, updateSoftwareVersion } = useStore_SoftwareVersion(); const getSoftwareVersion = () => { updateSoftwareVersion(() => new Promise(() => {})); asyncStdoutToPython("/config/version"); }; - return { currentSoftwareVersion, getSoftwareVersion, updateSoftwareVersion }; + return { + currentSoftwareVersion, + getSoftwareVersion, + updateSoftwareVersion, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSpeakerDeviceList.js b/src-ui/logics/configs/useSpeakerDeviceList.js index 1027d8d7..ec8cac1c 100644 --- a/src-ui/logics/configs/useSpeakerDeviceList.js +++ b/src-ui/logics/configs/useSpeakerDeviceList.js @@ -1,14 +1,18 @@ -import { useSpeakerDeviceList as useStoreSpeakerDeviceList } from "@store"; +import { useStore_SpeakerDeviceList } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSpeakerDeviceList = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { currentSpeakerDeviceList, updateSpeakerDeviceList } = useStoreSpeakerDeviceList(); + const { currentSpeakerDeviceList, updateSpeakerDeviceList } = useStore_SpeakerDeviceList(); const getSpeakerDeviceList = () => { updateSpeakerDeviceList(() => new Promise(() => {})); asyncStdoutToPython("/controller/list_speaker_device"); }; - return { currentSpeakerDeviceList, getSpeakerDeviceList, updateSpeakerDeviceList }; + return { + currentSpeakerDeviceList, + getSpeakerDeviceList, + updateSpeakerDeviceList, + }; }; \ No newline at end of file diff --git a/src-ui/logics/configs/useSpeakerThreshold.js b/src-ui/logics/configs/useSpeakerThreshold.js index 87d239da..f30c4382 100644 --- a/src-ui/logics/configs/useSpeakerThreshold.js +++ b/src-ui/logics/configs/useSpeakerThreshold.js @@ -1,9 +1,9 @@ -import { useSpeakerThreshold as useStoreSpeakerThreshold } from "@store"; +import { useStore_SpeakerThreshold } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useSpeakerThreshold = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { updateSpeakerThreshold, currentSpeakerThreshold } = useStoreSpeakerThreshold(); + const { updateSpeakerThreshold, currentSpeakerThreshold } = useStore_SpeakerThreshold(); const getSpeakerThreshold = () => { asyncStdoutToPython("/config/input_speaker_energy_threshold"); @@ -13,5 +13,10 @@ export const useSpeakerThreshold = () => { asyncStdoutToPython("/controller/callback_set_speaker_energy_threshold", speaker_threshold); }; - return { getSpeakerThreshold, setSpeakerThreshold, currentSpeakerThreshold, updateSpeakerThreshold }; + return { + currentSpeakerThreshold, + getSpeakerThreshold, + setSpeakerThreshold, + updateSpeakerThreshold, + }; }; \ No newline at end of file diff --git a/src-ui/logics/useMainFunction.js b/src-ui/logics/useMainFunction.js index f6ffa55a..88e20245 100644 --- a/src-ui/logics/useMainFunction.js +++ b/src-ui/logics/useMainFunction.js @@ -1,10 +1,10 @@ import { getCurrent } from "@tauri-apps/api/window"; import { - useTranslationStatus, - useTranscriptionSendStatus, - useTranscriptionReceiveStatus, - useForegroundStatus, + useStore_TranslationStatus, + useStore_TranscriptionSendStatus, + useStore_TranscriptionReceiveStatus, + useStore_ForegroundStatus, } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; @@ -14,21 +14,21 @@ export const useMainFunction = () => { currentTranslationStatus, updateTranslationStatus, asyncUpdateTranslationStatus, - } = useTranslationStatus(); + } = useStore_TranslationStatus(); const { currentTranscriptionSendStatus, updateTranscriptionSendStatus, asyncUpdateTranscriptionSendStatus, - } = useTranscriptionSendStatus(); + } = useStore_TranscriptionSendStatus(); const { currentTranscriptionReceiveStatus, updateTranscriptionReceiveStatus, asyncUpdateTranscriptionReceiveStatus, - } = useTranscriptionReceiveStatus(); + } = useStore_TranscriptionReceiveStatus(); const { currentForegroundStatus, updateForegroundStatus, - } = useForegroundStatus(); + } = useStore_ForegroundStatus(); const { asyncStdoutToPython } = useStdoutToPython(); diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/useMessage.js index 8c441ff5..bb3a1ea2 100644 --- a/src-ui/logics/useMessage.js +++ b/src-ui/logics/useMessage.js @@ -1,11 +1,11 @@ import { - useMessageLogsStatus, + useStore_MessageLogs, } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useMessage = () => { - const { currentMessageLogsStatus, addMessageLogsStatus, updateMessageLogsStatus } = useMessageLogsStatus(); + const { currentMessageLogs, addMessageLogs, updateMessageLogs } = useStore_MessageLogs(); const { asyncStdoutToPython } = useStdoutToPython(); const sendMessage = (message) => { @@ -16,7 +16,7 @@ export const useMessage = () => { }; asyncStdoutToPython("/controller/callback_messagebox_send", send_message_object); - addMessageLogsStatus({ + addMessageLogs({ id: uuid, category: "sent", status: "pending", @@ -29,19 +29,19 @@ export const useMessage = () => { }; const updateSentMessageLogById = (payload) => { - updateMessageLogsStatus(updateItemById(payload.id, payload.translation)); + updateMessageLogs(updateItemById(payload.id, payload.translation)); }; const addSentMessageLog = (payload) => { const message_object = generateMessageObject(payload, "sent"); - addMessageLogsStatus(message_object); + addMessageLogs(message_object); }; const addReceivedMessageLog = (payload) => { const message_object = generateMessageObject(payload, "received"); - addMessageLogsStatus(message_object); + addMessageLogs(message_object); }; return { - currentMessageLogsStatus, + currentMessageLogs, sendMessage, updateSentMessageLogById, addSentMessageLog, diff --git a/src-ui/logics/useVolume.js b/src-ui/logics/useVolume.js index cde153bc..ee0dc138 100644 --- a/src-ui/logics/useVolume.js +++ b/src-ui/logics/useVolume.js @@ -1,14 +1,14 @@ import { - useMicVolume, - useSpeakerVolume, + useStore_MicVolume, + useStore_SpeakerVolume, } from "@store"; import { useStdoutToPython } from "@logics/useStdoutToPython"; export const useVolume = () => { const { asyncStdoutToPython } = useStdoutToPython(); - const { updateMicVolume } = useMicVolume(); - const { updateSpeakerVolume } = useSpeakerVolume(); + const { updateMicVolume } = useStore_MicVolume(); + const { updateSpeakerVolume } = useStore_SpeakerVolume(); return { volumeCheckStart_Mic: () => asyncStdoutToPython("/controller/callback_enable_check_mic_threshold"), diff --git a/src-ui/logics/useWindow.js b/src-ui/logics/useWindow.js index 7502c1a9..21cee2cf 100644 --- a/src-ui/logics/useWindow.js +++ b/src-ui/logics/useWindow.js @@ -1,9 +1,9 @@ import { WebviewWindow } from "@tauri-apps/api/window"; -import { store, useIsOpenedConfigPage } from "@store"; +import { store, useStore_IsOpenedConfigPage } from "@store"; import { getCurrent } from "@tauri-apps/api/window"; export const useWindow = () => { - const { updateIsOpenedConfigPage } = useIsOpenedConfigPage(); + const { updateIsOpenedConfigPage } = useStore_IsOpenedConfigPage(); const createConfigPage = async () => { const main_page = getCurrent(); diff --git a/src-ui/store.js b/src-ui/store.js index 52b8b47c..721a0b9d 100644 --- a/src-ui/store.js +++ b/src-ui/store.js @@ -94,79 +94,76 @@ const createAsyncAtomWithHook = (initialValue, base_ame) => { return { atomInstance, useHook }; }; -export const { atomInstance: Atom_SoftwareVersion, useHook: useSoftwareVersion } = createAtomWithHook("-", "SoftwareVersion"); +export const { atomInstance: Atom_SoftwareVersion, useHook: useStore_SoftwareVersion } = createAtomWithHook("-", "SoftwareVersion"); -export const { atomInstance: Atom_UiLanguageStatus, useHook: useUiLanguageStatus } = createAtomWithHook("en", "UiLanguageStatus"); -export const { atomInstance: Atom_TranslationStatus, useHook: useTranslationStatus } = createAsyncAtomWithHook(false, "TranslationStatus"); -export const { atomInstance: Atom_TranscriptionSendStatus, useHook: useTranscriptionSendStatus } = createAsyncAtomWithHook(false, "TranscriptionSendStatus"); -export const { atomInstance: Atom_TranscriptionReceiveStatus, useHook: useTranscriptionReceiveStatus } = createAsyncAtomWithHook(false, "TranscriptionReceiveStatus"); -export const { atomInstance: Atom_ForegroundStatus, useHook: useForegroundStatus } = createAsyncAtomWithHook(false, "ForegroundStatus"); +export const { atomInstance: Atom_UiLanguage, useHook: useStore_UiLanguage } = createAtomWithHook("en", "UiLanguage"); +export const { atomInstance: Atom_TranslationStatus, useHook: useStore_TranslationStatus } = createAsyncAtomWithHook(false, "TranslationStatus"); +export const { atomInstance: Atom_TranscriptionSendStatus, useHook: useStore_TranscriptionSendStatus } = createAsyncAtomWithHook(false, "TranscriptionSendStatus"); +export const { atomInstance: Atom_TranscriptionReceiveStatus, useHook: useStore_TranscriptionReceiveStatus } = createAsyncAtomWithHook(false, "TranscriptionReceiveStatus"); +export const { atomInstance: Atom_ForegroundStatus, useHook: useStore_ForegroundStatus } = createAsyncAtomWithHook(false, "ForegroundStatus"); -export const { atomInstance: Atom_MessageLogsStatus, useHook: useMessageLogsStatus } = createAtomWithHook(generateTestData(20), "MessageLogsStatus"); -export const { atomInstance: Atom_MainPageCompactModeStatus, useHook: useMainPageCompactModeStatus } = createAtomWithHook(false, "MainPageCompactModeStatus"); -export const { atomInstance: Atom_IsOpenedLanguageSelector, useHook: useIsOpenedLanguageSelector } = createAtomWithHook( +export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook(generateTestData(20), "MessageLogs"); +export const { atomInstance: Atom_IsMainPageCompactMode, useHook: useStore_IsMainPageCompactMode } = createAtomWithHook(false, "IsMainPageCompactMode"); +export const { atomInstance: Atom_IsOpenedLanguageSelector, useHook: useStore_IsOpenedLanguageSelector } = createAtomWithHook( { your_language: false, target_language: false }, "IsOpenedLanguageSelector" ); -export const { atomInstance: Atom_SelectedPresetTabStatus, useHook: useSelectedPresetTabStatus } = createAtomWithHook(1, "SelectedPresetTabStatus"); -export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useIsOpenedConfigPage } = createAtomWithHook(false, "IsOpenedConfigPage"); -export const { atomInstance: Atom_SelectedConfigTabId, useHook: useSelectedConfigTabId } = createAtomWithHook("device", "SelectedConfigTabId"); -export const { atomInstance: Atom_IsOpenedDropdownMenu, useHook: useIsOpenedDropdownMenu } = createAtomWithHook("", "IsOpenedDropdownMenu"); +export const { atomInstance: Atom_SelectedPresetTabNumber, useHook: useStore_SelectedPresetTabNumber } = createAtomWithHook(1, "SelectedPresetTabNumber"); +export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useStore_IsOpenedConfigPage } = createAtomWithHook(false, "IsOpenedConfigPage"); +export const { atomInstance: Atom_SelectedConfigTabId, useHook: useStore_SelectedConfigTabId } = createAtomWithHook("device", "SelectedConfigTabId"); +export const { atomInstance: Atom_IsOpenedDropdownMenu, useHook: useStore_IsOpenedDropdownMenu } = createAtomWithHook("", "IsOpenedDropdownMenu"); // Config Page -export const { atomInstance: Atom_MicHostList, useHook: useMicHostList } = createAsyncAtomWithHook({}, "MicHostList"); -export const { atomInstance: Atom_SelectedMicHost, useHook: useSelectedMicHost } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicHost"); -export const { atomInstance: Atom_MicDeviceList, useHook: useMicDeviceList } = createAsyncAtomWithHook({}, "MicDeviceList"); -export const { atomInstance: Atom_SelectedMicDevice, useHook: useSelectedMicDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicDevice"); +export const { atomInstance: Atom_MicHostList, useHook: useStore_MicHostList } = createAsyncAtomWithHook({}, "MicHostList"); +export const { atomInstance: Atom_SelectedMicHost, useHook: useStore_SelectedMicHost } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicHost"); +export const { atomInstance: Atom_MicDeviceList, useHook: useStore_MicDeviceList } = createAsyncAtomWithHook({}, "MicDeviceList"); +export const { atomInstance: Atom_SelectedMicDevice, useHook: useStore_SelectedMicDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedMicDevice"); -export const { atomInstance: Atom_SpeakerDeviceList, useHook: useSpeakerDeviceList } = createAsyncAtomWithHook({}, "SpeakerDeviceList"); -export const { atomInstance: Atom_SelectedSpeakerDevice, useHook: useSelectedSpeakerDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedSpeakerDevice"); +export const { atomInstance: Atom_SpeakerDeviceList, useHook: useStore_SpeakerDeviceList } = createAsyncAtomWithHook({}, "SpeakerDeviceList"); +export const { atomInstance: Atom_SelectedSpeakerDevice, useHook: useStore_SelectedSpeakerDevice } = createAsyncAtomWithHook("Nothing Selected", "SelectedSpeakerDevice"); -export const { atomInstance: Atom_MicVolume, useHook: useMicVolume } = createAsyncAtomWithHook(0, "MicVolume"); -export const { atomInstance: Atom_SpeakerVolume, useHook: useSpeakerVolume } = createAsyncAtomWithHook(0, "SpeakerVolume"); +export const { atomInstance: Atom_MicVolume, useHook: useStore_MicVolume } = createAsyncAtomWithHook(0, "MicVolume"); +export const { atomInstance: Atom_SpeakerVolume, useHook: useStore_SpeakerVolume } = createAsyncAtomWithHook(0, "SpeakerVolume"); -export const { atomInstance: Atom_MicThreshold, useHook: useMicThreshold } = createAtomWithHook(0, "MicThreshold"); -export const { atomInstance: Atom_SpeakerThreshold, useHook: useSpeakerThreshold } = createAtomWithHook(0, "SpeakerThreshold"); +export const { atomInstance: Atom_MicThreshold, useHook: useStore_MicThreshold } = createAtomWithHook(0, "MicThreshold"); +export const { atomInstance: Atom_SpeakerThreshold, useHook: useStore_SpeakerThreshold } = createAtomWithHook(0, "SpeakerThreshold"); -export const { atomInstance: Atom_SendMessageFormat, useHook: useSendMessageFormat } = createAtomWithHook({ +export const { atomInstance: Atom_SendMessageFormat, useHook: useStore_SendMessageFormat } = createAtomWithHook({ before: "", after: "", }, "SendMessageFormat"); -export const { atomInstance: Atom_SendMessageFormatWithT, useHook: useSendMessageFormatWithT } = createAtomWithHook({ +export const { atomInstance: Atom_SendMessageFormatWithT, useHook: useStore_SendMessageFormatWithT } = createAtomWithHook({ before: "", between: "", after: "", is_message_first: true, }, "SendMessageFormatWithT"); -export const { atomInstance: Atom_ReceivedMessageFormat, useHook: useReceivedMessageFormat } = createAtomWithHook({ +export const { atomInstance: Atom_ReceivedMessageFormat, useHook: useStore_ReceivedMessageFormat } = createAtomWithHook({ before: "", after: "", }, "ReceivedMessageFormat"); -export const { atomInstance: Atom_ReceivedMessageFormatWithT, useHook: useReceivedMessageFormatWithT } = createAtomWithHook({ +export const { atomInstance: Atom_ReceivedMessageFormatWithT, useHook: useStore_ReceivedMessageFormatWithT } = createAtomWithHook({ before: "", between: "", after: "", is_message_first: true, }, "ReceivedMessageFormatWithT"); -export const { atomInstance: Atom_IsOpenedWordFilterList, useHook: useIsOpenedWordFilterList } = createAtomWithHook(false, "IsOpenedWordFilterList"); -export const { atomInstance: Atom_WordFilterList, useHook: useWordFilterList } = createAtomWithHook(word_filter_list, "WordFilterList"); - +export const { atomInstance: Atom_IsOpenedWordFilterList, useHook: useStore_IsOpenedWordFilterList } = createAtomWithHook(false, "IsOpenedWordFilterList"); +export const { atomInstance: Atom_WordFilterList, useHook: useStore_WordFilterList } = createAtomWithHook(word_filter_list, "WordFilterList"); // Others -export const { atomInstance: Atom_EnableAutoClearMessageBox, useHook: useEnableAutoClearMessageBox } = createAsyncAtomWithHook(true, "EnableAutoClearMessageBox"); -export const { atomInstance: Atom_SendMessageButtonType, useHook: useSendMessageButtonType } = createAsyncAtomWithHook("show", "SendMessageButtonType"); +export const { atomInstance: Atom_EnableAutoClearMessageBox, useHook: useStore_EnableAutoClearMessageBox } = createAsyncAtomWithHook(true, "EnableAutoClearMessageBox"); +export const { atomInstance: Atom_SendMessageButtonType, useHook: useStore_SendMessageButtonType } = createAsyncAtomWithHook("show", "SendMessageButtonType"); +export const { atomInstance: Atom_TranslatorList, useHook: useStore_TranslatorList } = createAtomWithHook(translator_list, "TranslatorList"); +export const { atomInstance: Atom_SelectedTranslatorId, useHook: useStore_SelectedTranslatorId } = createAtomWithHook("CTranslate2", "SelectedTranslatorId"); +export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useStore_IsOpenedTranslatorSelector } = createAtomWithHook(false, "IsOpenedTranslatorSelector"); - -export const { atomInstance: Atom_TranslatorListStatus, useHook: useTranslatorListStatus } = createAtomWithHook(translator_list, "TranslatorListStatus"); -export const { atomInstance: Atom_SelectedTranslatorIdStatus, useHook: useSelectedTranslatorIdStatus } = createAtomWithHook("CTranslate2", "SelectedTranslatorIdStatus"); -export const { atomInstance: Atom_IsOpenedTranslatorSelector, useHook: useIsOpenedTranslatorSelector } = createAtomWithHook(false, "IsOpenedTranslatorSelector"); - -export const { atomInstance: Atom_VrctPosterIndex, useHook: useVrctPosterIndex } = createAtomWithHook(0, "VrctPosterIndex"); -export const { atomInstance: Atom_PosterShowcaseWorldPageIndex, useHook: usePosterShowcaseWorldPageIndex } = createAtomWithHook(0, "PosterShowcaseWorldPageIndex"); \ No newline at end of file +export const { atomInstance: Atom_VrctPosterIndex, useHook: useStore_VrctPosterIndex } = createAtomWithHook(0, "VrctPosterIndex"); +export const { atomInstance: Atom_PosterShowcaseWorldPageIndex, useHook: useStore_PosterShowcaseWorldPageIndex } = createAtomWithHook(0, "PosterShowcaseWorldPageIndex"); \ No newline at end of file