Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MobileHeaderBarをHeaderBarと統合 #44

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build/matexRecipes.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
toolbarIcons.svg:
saveVoice: save + volume_up
playAll: filled:play_arrow + notes
exportSelected: filled:save + volume_up
exportConnectAll: filled:save + link
exportAll: filled:save + notes
importText: filled:upload + outlined:import_contacts
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@openapitools/openapi-generator-cli": "2.7.0",
"@playwright/test": "1.40.1",
"@quasar/vite-plugin": "1.3.0",
"@sevenc-nanashi/matex": "1.0.1",
"@sevenc-nanashi/matex": "1.1.1",
"@types/async-lock": "1.4.0",
"@types/clone-deep": "4.0.1",
"@types/crypto-js": "4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion public/toolbarIcons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/backend/mobile/sandbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,10 @@ export const api: Sandbox = {
);
},
vuexReady() {
SplashScreen.hide();
// 1フレーム遅らせることで、真っ白の画面が表示されるのを防ぐ。
requestAnimationFrame(() => {
SplashScreen.hide();
});
Comment on lines +279 to +282
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

消えてたことに気がついたので。

},
async getSetting(key) {
const configManager = await getConfigManager();
Expand Down
6 changes: 6 additions & 0 deletions src/components/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<script setup lang="ts">
import { watch, onMounted, ref, computed, toRaw } from "vue";
import { useGtm } from "@gtm-support/vue-gtm";
import { useQuasar, Notify } from "quasar";
import TalkEditor from "@/components/Talk/TalkEditor.vue";
import SingEditor from "@/components/Sing/SingEditor.vue";
import { EngineId } from "@/type/preload";
Expand All @@ -27,6 +28,11 @@ import AllDialog from "@/components/Dialog/AllDialog.vue";

const store = useStore();

const $q = useQuasar();
Notify.setDefaults({
position: $q.platform.is.desktop ? "bottom" : "top",
});

const openedEditor = computed(() => store.state.openedEditor);

/**
Expand Down
133 changes: 0 additions & 133 deletions src/components/MobileHeaderBar.vue

This file was deleted.

83 changes: 83 additions & 0 deletions src/components/Talk/MobileMenuButton.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<template>
<QBtn flat round dense>
<QIcon name="menu" />
<QMenu transition-show="none" transition-hide="none">
<QList dense>
<MenuItem
v-for="(item, index) in menudata"
:key="item.label"
v-model:selected="subMenuOpenFlags[index]"
:menudata="item"
/>
</QList>
</QMenu>
</QBtn>
<QSeparator vertical spaced inset color="background" />
</template>

<script setup lang="ts">
import { ref } from "vue";
import MenuItem from "@/components/Menu/MenuItem.vue";
import { MenuItemData } from "@/components/Menu/type";

const menudata = ref<MenuItemData[]>([
{
type: "button",
label: "選択している音声を書き出し",
onClick: () => {
alert("TODO");
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "すべての音声を書き出し",
onClick: () => {
alert("TODO");
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "すべての音声を繋げて書き出し",
onClick: () => {
alert("TODO");
},
disableWhenUiLocked: true,
},
{
type: "separator",
},
{
type: "button",
label: "テキストを繋げて書き出し",
onClick: () => {
alert("TODO");
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "テキスト読み込み",
onClick: () => {
alert("TODO");
},
disableWhenUiLocked: true,
},
{
type: "separator",
},
{
type: "button",
label: "メニューに戻る",
onClick: () => {
alert("TODO");
},
disableWhenUiLocked: true,
},
]);

const subMenuOpenFlags = ref<boolean[]>(
[...Array(menudata.value.length)].map(() => false)
);
</script>
3 changes: 1 addition & 2 deletions src/components/Talk/TalkEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

<QLayout reveal elevated container class="layout-container">
<ToolBar v-if="$q.platform.is.desktop" />
<MobileHeaderBar v-else />

<QPageContainer>
<QPage class="main-row-panes">
Expand Down Expand Up @@ -124,6 +123,7 @@
/>
</QPage>
</QPageContainer>
<ToolBar v-if="!$q.platform.is.desktop" />
</QLayout>
</template>

Expand All @@ -149,7 +149,6 @@ import {
SplitterPositionType,
Voice,
} from "@/type/preload";
import MobileHeaderBar from "@/components/MobileHeaderBar.vue";
import { useHotkeyManager } from "@/plugins/hotkeyPlugin";
import onetimeWatch from "@/helpers/onetimeWatch";

Expand Down
Loading
Loading