ion/Melo
1
0
Fork 0
Code Issues Pull Requests Actions 11 Packages Projects Releases Wiki Activity

更新歌曲播放栏布局

Browse Source
This commit is contained in:
lyswhut
2022-11-03 06:34:57 +08:00
parent 2003c5a0c9
commit 716120ea61
25 changed files with 731 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/common/ProgressBar.vue
+2 -2
View File
@@ -102,7 +102,7 @@ export default {
background-color: var(--color-primary-light-100-alpha-800);
// background-color: #f5f5f5;
position: relative;
border-radius: 20px;
// border-radius: 20px;
}
.progress-mask {
position: absolute;
@@ -119,7 +119,7 @@ export default {
width: 100%;
height: 100%;
transform-origin: 0;
border-radius: 20px;
// border-radius: 20px;
}
.progress-bar1 {
background-color: var(--color-primary-light-100-alpha-600);
src/renderer/components/common/TogglePlayModeBtn.vue
+147
View File
@@ -0,0 +1,147 @@
<template>
<material-popup-btn ref="btn_ref" :class="$style.btnContent">
<button :class="$style.btn" :aria-label="nextTogglePlayName">
<svg
v-if="appSetting['player.togglePlayMethod'] == 'listLoop'"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xlink="http://www.w3.org/1999/xlink"
height="80%" viewBox="0 0 24 24" space="preserve"
>
<use xlink:href="#icon-list-loop" />
</svg>
<svg
v-else-if="appSetting['player.togglePlayMethod'] == 'random'"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xlink="http://www.w3.org/1999/xlink"
width="100%" viewBox="0 0 24 24" space="preserve"
>
<use xlink:href="#icon-list-random" />
</svg>
<svg
v-else-if="appSetting['player.togglePlayMethod'] == 'list'"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xlink="http://www.w3.org/1999/xlink"
width="100%" viewBox="0 0 32 32" space="preserve"
>
<use xlink:href="#icon-list-order" />
</svg>
<svg
v-else-if="appSetting['player.togglePlayMethod'] == 'singleLoop'"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xlink="http://www.w3.org/1999/xlink"
width="100%" viewBox="0 0 24 24" space="preserve"
>
<use xlink:href="#icon-single-loop" />
</svg>
<svg v-else version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" width="100%" viewBox="0 0 32 32" space="preserve">
<use xlink:href="#icon-single" />
</svg>
</button>
<template #content>
<div :class="$style.setting">
<button :class="[$style.btn, {[$style.active]: appSetting['player.togglePlayMethod'] == 'listLoop'}]" :aria-label="$t('player__play_toggle_mode_list_loop')" @click="toggleMode('listLoop')">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" height="100%" viewBox="0 0 24 24" space="preserve">
<use xlink:href="#icon-list-loop" />
</svg>
</button>
<button :class="[$style.btn, {[$style.active]: appSetting['player.togglePlayMethod'] == 'random'}]" :aria-label="$t('player__play_toggle_mode_random')" @click="toggleMode('random')">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" width="100%" viewBox="0 0 24 24" space="preserve">
<use xlink:href="#icon-list-random" />
</svg>
</button>
<button :class="[$style.btn, {[$style.active]: appSetting['player.togglePlayMethod'] == 'singleLoop'}]" :aria-label="$t('player__play_toggle_mode_single_loop')" @click="toggleMode('list')">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" width="100%" viewBox="0 0 32 32" space="preserve">
<use xlink:href="#icon-list-order" />
</svg>
</button>
<button :class="[$style.btn, {[$style.active]: appSetting['player.togglePlayMethod'] == 'list'}]" :aria-label="$t('player__play_toggle_mode_list')" @click="toggleMode('singleLoop')">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" width="100%" viewBox="0 0 24 24" space="preserve">
<use xlink:href="#icon-single-loop" />
</svg>
</button>
<button :class="[$style.btn, {[$style.active]: appSetting['player.togglePlayMethod'] == 'none'}]" :aria-label="$t('player__play_toggle_mode_off')" @click="toggleMode('none')">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" width="100%" viewBox="0 0 32 32" space="preserve">
<use xlink:href="#icon-single" />
</svg>
</button>
</div>
</template>
</material-popup-btn>
</template>
<script setup>
import { ref } from '@common/utils/vueTools'
// import useNextTogglePlay from '@renderer/utils/compositions/useNextTogglePlay'
// import useToggleDesktopLyric from '@renderer/utils/compositions/useToggleDesktopLyric'
// import { musicInfo, playMusicInfo } from '@renderer/store/player/state'
import { appSetting } from '@renderer/store/setting'
import useNextTogglePlay from '@renderer/utils/compositions/useNextTogglePlay'
const btn_ref = ref(null)
const {
nextTogglePlayName,
toggleNextPlayMode,
} = useNextTogglePlay()
const toggleMode = (mode) => {
btn_ref.value.hide()
toggleNextPlayMode(mode)
}
</script>
<style lang="less" module>
@import '@renderer/assets/styles/layout.less';
.btnContent {
flex: none;
height: 100%;
}
.btn {
position: relative;
// color: var(--color-button-font);
justify-content: center;
align-items: center;
transition: color @transition-normal;
cursor: pointer;
background-color: transparent;
border: none;
width: 24px;
display: flex;
flex-flow: column nowrap;
padding: 0;
svg {
transition: opacity @transition-fast;
opacity: .6;
filter: drop-shadow(0 0 1px rgba(0, 0, 0, 0.2));
}
&:hover {
svg {
opacity: .9;
}
}
&:active {
svg {
opacity: 1;
}
}
}
.setting {
display: flex;
flex-flow: row nowrap;
font-size: 14px;
gap: 10px;
label span {
line-height: 1;
}
}
</style>
src/renderer/components/common/VolumeBar.vue
+15 -14
View File
@@ -1,9 +1,9 @@
<template>
<div :class="[$style.volumeContent, className]">
<div :class="[$style.volume, {[$style.muted]: appSetting['player.isMute']} ]">
<div :class="[$style.volume ]">
<div ref="dom_volumeBar" :class="$style.volumeBar" :style="{ transform: `scaleX(${volume || 0})` }" />
</div>
<div :class="$style.volumeMask" :aria-label="`${$t('player__volume')}${parseInt(volume * 100)}%`" @mousedown="handleVolumeMsDown" />
<div :class="$style.volumeMask" @mousedown="handleVolumeMsDown" />
</div>
</template>
@@ -39,7 +39,7 @@ export default {
window.app_event.setVolume(volumeEvent.msDownVolume = val)
if (isMute.value) window.app_event.setVolumeIsMute(false)
// if (isMute.value) window.app_event.setVolumeIsMute(false)
}
const handleVolumeMsUp = () => {
volumeEvent.isMsDown = false
@@ -76,8 +76,9 @@ export default {
.volume-content {
flex: none;
position: relative;
width: 80px;
margin-right: 10px;
width: 100px;
padding: 5px 0;
// margin-right: 10px;
display: flex;
align-items: center;
opacity: .5;
@@ -90,20 +91,20 @@ export default {
.volume {
// cursor: pointer;
width: 100%;
height: 0.25em;
border-radius: 10px;
height: 5px;
// border-radius: 10px;
// overflow: hidden;
transition: @transition-normal;
transition-property: background-color, opacity;
background-color: var(--color-button-background);
background-color: var(--color-primary-alpha-700);
// background-color: #f5f5f5;
position: relative;
border-radius: @radius-progress-border;
// border-radius: @radius-progress-border;
}
.muted {
opacity: .5;
}
// .muted {
// opacity: .5;
// }
.volume-bar {
position: absolute;
@@ -115,9 +116,9 @@ export default {
transition-timing-function: ease;
width: 100%;
height: 100%;
border-radius: @radius-progress-border;
// border-radius: @radius-progress-border;
transition-duration: 0.2s;
background-color: var(--color-button-background);
background-color: var(--color-button-font);
box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
}
src/renderer/components/common/VolumeBtn.vue
+94
View File
@@ -0,0 +1,94 @@
<template>
<material-popup-btn :class="$style.btnContent">
<button :class="$style.btn" :aria-label="isMute ? $t('player__volume_muted') : `${$t('player__volume')}${parseInt(volume * 100)}%`">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xlink="http://www.w3.org/1999/xlink" width="100%" viewBox="0 0 24 24" space="preserve">
<use :xlink:href="icon" />
</svg>
</button>
<template #content>
<div :class="$style.setting">
<span>{{ Math.trunc(volume * 100) }}%</span>
<common-volume-bar />
<base-checkbox
id="player__volume_mute"
:model-value="isMute"
:label="$t('player__volume_mute_label')"
@update:model-value="saveVolumeIsMute($event)"
/>
</div>
</template>
</material-popup-btn>
</template>
<script setup>
import { computed } from '@common/utils/vueTools'
// import useNextTogglePlay from '@renderer/utils/compositions/useNextTogglePlay'
// import useToggleDesktopLyric from '@renderer/utils/compositions/useToggleDesktopLyric'
// import { musicInfo, playMusicInfo } from '@renderer/store/player/state'
import { saveVolumeIsMute } from '@renderer/store/setting'
import { volume, isMute } from '@renderer/store/player/volume'
const icon = computed(() => {
return isMute.value
? '#icon-volume-mute-outline'
: volume.value == 0
? '#icon-volume-off-outline'
: volume.value < 0.3
? '#icon-volume-low-outline'
: volume.value < 0.7
? '#icon-volume-medium-outline'
: '#icon-volume-high-outline'
})
</script>
<style lang="less" module>
@import '@renderer/assets/styles/layout.less';
.btnContent {
flex: none;
height: 100%;
}
.btn {
position: relative;
// color: var(--color-button-font);
justify-content: center;
align-items: center;
transition: color @transition-normal;
cursor: pointer;
background-color: transparent;
border: none;
width: 24px;
display: flex;
flex-flow: column nowrap;
padding: 0;
svg {
transition: opacity @transition-fast;
opacity: .6;
filter: drop-shadow(0 0 1px rgba(0, 0, 0, 0.2));
}
&:hover {
svg {
opacity: .9;
}
}
&:active {
svg {
opacity: 1;
}
}
}
.setting {
display: flex;
flex-flow: column nowrap;
font-size: 14px;
gap: 8px;
label span {
line-height: 1;
}
}
</style>