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

Fix/change UI setting qall #4192

Merged
merged 24 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
084ea2b
設定画面(通話)の項目の順番変更、文章の一部修正、ラジオボタンのレイアウト変更
damin3A3 Dec 9, 2023
00a4c44
設定画面(通話)のレイアウト、見た目微調整
damin3A3 Dec 9, 2023
cd8048e
設定画面(通話)のレイアウト変更
damin3A3 Dec 9, 2023
267ee07
文字関連の変更を一度消した
damin3A3 Dec 9, 2023
77a781f
変更を戻した
damin3A3 Dec 9, 2023
0a6646c
コードの細かい修正
damin3A3 Dec 9, 2023
fce2b7c
Merge branch 'master' into fix/change_UI_Setting_Qall
damin3A3 Dec 9, 2023
424b9c6
Merge branch 'master' into fix/change_UI_Setting_Qall
damin3A3 Dec 28, 2023
b42c4f0
指摘をいただいたところの修正
damin3A3 Dec 28, 2023
6227ea4
prettierでのフォーマット修正
damin3A3 Dec 28, 2023
fd7e59d
タグの修正
damin3A3 Dec 29, 2023
2d0d30a
行間調整
damin3A3 Dec 30, 2023
4f77a77
コードのフォーマットの修正
damin3A3 Dec 30, 2023
56f7f20
ラジオボタンの変更を元に戻した
damin3A3 Dec 30, 2023
394a67b
スライダの背景色を消去した
damin3A3 Jan 12, 2024
1846ee5
Merge branch 'master' into fix/change_UI_Setting_Qall
damin3A3 Jan 12, 2024
3f0aa29
ラベルの色の修正
damin3A3 Jan 22, 2024
70cf5ff
vue-slider-componentを使用した(色未修正)
damin3A3 Jan 23, 2024
b473e77
フォーマット修正
damin3A3 Jan 23, 2024
2fa1e4a
データ型の統一
damin3A3 Jan 23, 2024
3c61a3a
フォーマット再修正
damin3A3 Jan 23, 2024
5c9b05c
データ型の修正を試みた
damin3A3 Jan 23, 2024
4689e71
スライダの色を調整した
damin3A3 Jan 27, 2024
1942bf9
スライダーのクリック範囲を広くした
damin3A3 Jan 29, 2024
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
59 changes: 28 additions & 31 deletions src/components/Settings/QallTab/NoiseSuppression.vue
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
<template>
<div>
<h3 :class="$style.header">ノイズ抑制</h3>
<div :class="$style.content">
<template v-if="isAudioWorkletSupported">
<form-radio
v-model="noiseSuppressionValue"
:class="$style.input"
label="Rnnoise"
input-value="rnnoise"
/>
<form-radio
v-model="noiseSuppressionValue"
:class="$style.input"
label="Speex"
input-value="speex"
/>
<form-radio
v-model="noiseSuppressionValue"
:class="$style.input"
label="無効"
input-value="none"
/>
</template>
<p v-else>利用している端末が対応していません</p>
</div>
</div>
<section>
<h3 :class="$style.heading">ノイズ抑制</h3>
<template v-if="isAudioWorkletSupported">
<form-radio
v-model="noiseSuppressionValue"
:class="$style.input"
label="Rnnoise"
input-value="rnnoise"
/>
<form-radio
v-model="noiseSuppressionValue"
:class="$style.input"
label="Speex"
input-value="speex"
/>
<form-radio
v-model="noiseSuppressionValue"
:class="$style.input"
label="無効"
input-value="none"
/>
</template>
<p v-else>利用している端末が対応していません。</p>
</section>
</template>

<script lang="ts" setup>
Expand All @@ -47,13 +45,12 @@ const isAudioWorkletSupported = checkAudioWorkletSupport()
</script>

<style lang="scss" module>
.header {
margin-bottom: 8px;
}
.content {
margin-left: 12px;
.heading {
margin-bottom: 4px;
}
.input {
display: block;
font-weight: bold;
Comment on lines +52 to +53
Copy link
Contributor

Choose a reason for hiding this comment

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

NatsukiくんのPRでFormRadioコンポーネント自体を変えてもらってるので、ここらへんはもしかしたらまたちょっと変えてもらうかもです

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ありがとうございます!
一旦変えずに今後の指示を待ちます。

margin-right: 8px;
}
</style>
2 changes: 2 additions & 0 deletions src/components/UI/ASlider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
:min="min"
:max="max"
:disabled="disabled"
:interval="interval"
:tooltip="tooltip"
:tooltip-formatter="tooltipFormatter"
:dot-size="12"
Expand All @@ -27,6 +28,7 @@ const props = withDefaults(
max?: number
tooltipFormatter?: TooltipFormatter
tooltip?: TooltipProp
interval?: number
}>(),
{
disabled: false,
Expand Down
5 changes: 2 additions & 3 deletions src/components/UI/FormInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ defineExpose({ focus })

<style lang="scss" module>
.label {
@include color-ui-secondary;
@include color-ui-primary;
display: block;
margin-bottom: 8px;
margin-bottom: 4px;
}
.inputContainer {
@include color-ui-primary;
Expand All @@ -137,7 +137,6 @@ defineExpose({ focus })
&[data-on-secondary] {
@include background-primary;
}

border: solid 2px transparent;
&:focus-within {
border-color: $theme-accent-focus-default;
Expand Down
42 changes: 29 additions & 13 deletions src/components/UI/FormRangeWithValue.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<template>
<div :class="$style.container">
<form-input
<a-slider
v-model.number="value"
:class="$style.range"
type="range"
:min="min"
:step="step"
:max="max"
:disabled="disabled"
:tooltip="'none'"
Copy link
Contributor

Choose a reason for hiding this comment

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

nits

Suggested change
:tooltip="'none'"
tooltip="none"

:interval="interval"
Comment on lines +3 to +10
Copy link
Contributor

Choose a reason for hiding this comment

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

imo
今ちょっと縦のクリック可能範囲が狭くてクリックしづらいので、↓を入れるとかして(もっといい方法あればstyle属性入れる以外の方法がいいけど、ライブラリ側のstyle属性に上書きされちゃって難しそうかも?)クリック可能範囲を増やしてほしいかもです(デザインとちょっと余白とか変わっちゃってもOKです)
:style="{padding: '24px 0'}"

分かりづらいけど赤矢印で示した幅↓
image

/>
<semi-fixed-size-text
align="right"
Expand All @@ -18,18 +19,24 @@

<script lang="ts" setup>
import { computed } from 'vue'
import FormInput from '/@/components/UI/FormInput.vue'
import { useModelValueSyncer } from '/@/composables/useModelSyncer'
import SemiFixedSizeText from './SemiFixedSizeText.vue'
import ASlider from '/@/components/UI/ASlider.vue'

const props = defineProps<{
modelValue: number
maxText: string
min?: string
max?: string
step?: string
format: (v: number) => string
}>()
const props = withDefaults(
defineProps<{
modelValue: number
maxText: string
min?: number
max?: number
disabled?: boolean
interval?: number
format: (v: number) => string
}>(),
{
disabled: false
}
)

const emit = defineEmits<{
(e: 'update:modelValue', v: number): void
Expand All @@ -47,6 +54,15 @@ const showValue = computed(() => props.format(value.value))
}
.range {
flex: 1 1;
margin-right: 4px;
margin-right: 16px;
:global {
$dotBgColor: $theme-accent-primary-background;
$dotShadow: none;

$bgColor: rgba(107, 125, 138, 0.5); // $theme-ui-secondary-default;
$themeColor: $theme-accent-primary-background;

@import 'vue-slider-component/lib/theme/default.scss';
}
}
</style>
4 changes: 2 additions & 2 deletions src/components/UI/FormSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ const id = randomString()

<style lang="scss" module>
.label {
@include color-ui-secondary;
margin-bottom: 8px;
@include color-ui-primary;
margin-bottom: 4px;
display: block;
}
.inputContainer {
Expand Down
Loading
Loading