feat: lyrics dynamic background (#424)

* feat: init dynamic background

* feat: another way to achieve

* feat: add setting for dynamic background

* feat: add contrast and brightness for better UI

* fix: remove shadow when exit lyrics

* feat: UI improve, field name change

* refactor: scope variables
master
wenjie 4 years ago committed by GitHub
parent 387917e3ee
commit 59397ed535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -28,6 +28,7 @@ button {
} }
&:hover { &:hover {
background: var(--color-secondary-bg-for-transparent); background: var(--color-secondary-bg-for-transparent);
opacity: 0.88;
} }
&:active { &:active {
transform: scale(0.92); transform: scale(0.92);

@ -142,6 +142,7 @@ export default {
clearSongsCache: "Clear Songs Cache", clearSongsCache: "Clear Songs Cache",
cacheCount: "Cached {song} songs ({size})", cacheCount: "Cached {song} songs ({size})",
showLyricsTranslation: "Show lyrics translation", showLyricsTranslation: "Show lyrics translation",
showLyricsDynamicBackground: "Show lyrics dynamic background",
minimizeToTray: "Minimize to tray", minimizeToTray: "Minimize to tray",
showGitHubIcon: "Show GitHub icon", showGitHubIcon: "Show GitHub icon",
showUnavailableSongInGreyStyle: "Show unavailable song in grey style", showUnavailableSongInGreyStyle: "Show unavailable song in grey style",

@ -143,6 +143,7 @@ export default {
clearSongsCache: "清除歌曲缓存", clearSongsCache: "清除歌曲缓存",
cacheCount: "已缓存 {song} 首 ({size})", cacheCount: "已缓存 {song} 首 ({size})",
showLyricsTranslation: "显示歌词翻译", showLyricsTranslation: "显示歌词翻译",
showLyricsDynamicBackground: "显示歌词动态背景",
minimizeToTray: "最小化到托盘", minimizeToTray: "最小化到托盘",
showGitHubIcon: "显示 GitHub 图标", showGitHubIcon: "显示 GitHub 图标",
showUnavailableSongInGreyStyle: "显示不可播放的歌曲为灰色", showUnavailableSongInGreyStyle: "显示不可播放的歌曲为灰色",

@ -15,6 +15,7 @@ let localStorage = {
automaticallyCacheSongs: false, automaticallyCacheSongs: false,
nyancatStyle: false, nyancatStyle: false,
showLyricsTranslation: true, showLyricsTranslation: true,
showLyricsDynamicBackground: false,
minimizeToTray: false, minimizeToTray: false,
enableDiscordRichPresence: false, enableDiscordRichPresence: false,
}, },

@ -1,6 +1,21 @@
<template> <template>
<transition name="slide-up"> <transition name="slide-up">
<div class="lyrics-page" :class="{ 'no-lyric': noLyric }"> <div class="lyrics-page" :class="{ 'no-lyric': noLyric }">
<div
v-if="this.$store.state.settings.showLyricsDynamicBackground"
class="dynamic-background"
>
<div v-show="this.$store.state.showLyrics">
<div
class="top-right"
:style="{ backgroundImage: `url(${imageUrl})` }"
/>
<div
class="bottom-left"
:style="{ backgroundImage: `url(${imageUrl})` }"
/>
</div>
</div>
<div class="left-side"> <div class="left-side">
<div> <div>
<div class="cover"> <div class="cover">
@ -15,37 +30,39 @@
<div class="controls"> <div class="controls">
<div class="top-part"> <div class="top-part">
<div class="track-info"> <div class="track-info">
<div class="title" :title="currentTrack.name" <div class="title" :title="currentTrack.name">
><router-link <router-link
:to="`/${player.playlistSource.type}/${player.playlistSource.id}`" :to="`/${player.playlistSource.type}/${player.playlistSource.id}`"
@click.native="toggleLyrics" @click.native="toggleLyrics"
>{{ currentTrack.name }}</router-link >{{ currentTrack.name }}
></div </router-link>
> </div>
<div class="subtitle" <div class="subtitle">
><router-link <router-link
:to="`/artist/${currentTrack.ar[0].id}`" :to="`/artist/${currentTrack.ar[0].id}`"
@click.native="toggleLyrics" @click.native="toggleLyrics"
>{{ currentTrack.ar[0].name }}</router-link >{{ currentTrack.ar[0].name }}
> </router-link>
- -
<router-link <router-link
:to="`/album/${currentTrack.al.id}`" :to="`/album/${currentTrack.al.id}`"
@click.native="toggleLyrics" @click.native="toggleLyrics"
:title="currentTrack.al.name" :title="currentTrack.al.name"
>{{ currentTrack.al.name }}</router-link >{{ currentTrack.al.name }}
></div </router-link>
> </div>
</div> </div>
<div class="buttons"> <div class="buttons">
<button-icon <button-icon
@click.native="playerRef.likeCurrentSong" @click.native="playerRef.likeCurrentSong"
:title="$t('player.like')" :title="$t('player.like')"
><svg-icon >
<svg-icon
:icon-class=" :icon-class="
playerRef.isCurrentTrackLiked ? 'heart-solid' : 'heart' playerRef.isCurrentTrackLiked ? 'heart-solid' : 'heart'
" "
/></button-icon> />
</button-icon>
<!-- <button-icon @click.native="openMenu" title="Menu" <!-- <button-icon @click.native="openMenu" title="Menu"
><svg-icon icon-class="more" ><svg-icon icon-class="more"
/></button-icon> --> /></button-icon> -->
@ -66,8 +83,8 @@
:tooltipFormatter="formatTrackTime" :tooltipFormatter="formatTrackTime"
@drag-end="setSeek" @drag-end="setSeek"
ref="progress" ref="progress"
></vue-slider ></vue-slider>
></div> </div>
<span>{{ formatTrackTime(progressMax) }}</span> <span>{{ formatTrackTime(progressMax) }}</span>
</div> </div>
<div class="media-controls"> <div class="media-controls">
@ -95,33 +112,40 @@
v-show="!player.isPersonalFM" v-show="!player.isPersonalFM"
@click.native="playerRef.previous" @click.native="playerRef.previous"
:title="$t('player.previous')" :title="$t('player.previous')"
><svg-icon icon-class="previous" >
/></button-icon> <svg-icon icon-class="previous" />
</button-icon>
<button-icon <button-icon
v-show="player.isPersonalFM" v-show="player.isPersonalFM"
@click.native="moveToFMTrash" @click.native="moveToFMTrash"
title="不喜欢" title="不喜欢"
><svg-icon icon-class="thumbs-down" >
/></button-icon> <svg-icon icon-class="thumbs-down" />
</button-icon>
<button-icon <button-icon
id="play" id="play"
@click.native="playerRef.play" @click.native="playerRef.play"
:title="$t(player.playing ? 'player.pause' : 'player.play')" :title="$t(player.playing ? 'player.pause' : 'player.play')"
><svg-icon :icon-class="playerRef.playing ? 'pause' : 'play'" >
/></button-icon> <svg-icon
:icon-class="playerRef.playing ? 'pause' : 'play'"
/>
</button-icon>
<button-icon <button-icon
@click.native="playerRef.next" @click.native="playerRef.next"
:title="$t('player.next')" :title="$t('player.next')"
><svg-icon icon-class="next" >
/></button-icon> <svg-icon icon-class="next" />
</button-icon>
</div> </div>
<button-icon <button-icon
v-show="!player.isPersonalFM" v-show="!player.isPersonalFM"
@click.native="playerRef.shuffle" @click.native="playerRef.shuffle"
:title="$t('player.shuffle')" :title="$t('player.shuffle')"
:class="{ active: player.shuffle }" :class="{ active: player.shuffle }"
><svg-icon icon-class="shuffle" >
/></button-icon> <svg-icon icon-class="shuffle" />
</button-icon>
</div> </div>
</div> </div>
</div> </div>
@ -150,7 +174,9 @@
</transition> </transition>
</div> </div>
<div class="close-button" @click="toggleLyrics"> <div class="close-button" @click="toggleLyrics">
<button><svg-icon icon-class="arrow-down" /></button> <button>
<svg-icon icon-class="arrow-down" />
</button>
</div> </div>
</div> </div>
</transition> </transition>
@ -346,6 +372,52 @@ export default {
display: flex; display: flex;
} }
.dynamic-background {
--contrast-dynamic-background: 75%;
--brightness-dynamic-background: 150%;
}
[data-theme="dark"] .dynamic-background {
--contrast-dynamic-background: 125%;
--brightness-dynamic-background: 50%;
}
.dynamic-background {
.top-right,
.bottom-left {
z-index: 0;
width: 140vw;
height: 140vw;
position: absolute;
filter: blur(50px) opacity(0.6) contrast(var(--contrast-dynamic-background))
brightness(var(--brightness-dynamic-background));
background-size: cover;
animation: rotate 150s linear infinite;
}
.top-right {
right: 0;
top: 0;
mix-blend-mode: luminosity;
}
.bottom-left {
left: 0;
bottom: 0;
animation-direction: reverse;
animation-delay: 10s;
}
}
@keyframes rotate {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
.left-side { .left-side {
flex: 1; flex: 1;
display: flex; display: flex;
@ -354,10 +426,12 @@ export default {
margin-top: 24px; margin-top: 24px;
align-items: center; align-items: center;
transition: all 0.5s; transition: all 0.5s;
.controls { .controls {
max-width: 54vh; max-width: 54vh;
margin-top: 24px; margin-top: 24px;
color: var(--color-text); color: var(--color-text);
.title { .title {
margin-top: 8px; margin-top: 8px;
font-size: 1.4rem; font-size: 1.4rem;
@ -368,6 +442,7 @@ export default {
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
overflow: hidden; overflow: hidden;
} }
.subtitle { .subtitle {
margin-top: 4px; margin-top: 4px;
font-size: 1rem; font-size: 1rem;
@ -381,12 +456,15 @@ export default {
.top-part { .top-part {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.buttons { .buttons {
display: flex; display: flex;
align-items: center; align-items: center;
button { button {
margin: 0 0 0 4px; margin: 0 0 0 4px;
} }
.svg-icon { .svg-icon {
opacity: 0.58; opacity: 0.58;
height: 18px; height: 18px;
@ -394,50 +472,61 @@ export default {
} }
} }
} }
.progress-bar { .progress-bar {
margin-top: 22px; margin-top: 22px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.slider { .slider {
width: 100%; width: 100%;
flex-grow: grow; flex-grow: grow;
padding: 0 10px; padding: 0 10px;
} }
span { span {
font-size: 15px; font-size: 15px;
opacity: 0.58; opacity: 0.58;
min-width: 28px; min-width: 28px;
} }
} }
.media-controls { .media-controls {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 18px; margin-top: 18px;
align-items: center; align-items: center;
button { button {
margin: 0; margin: 0;
} }
.svg-icon { .svg-icon {
opacity: 0.38; opacity: 0.38;
height: 14px; height: 14px;
width: 14px; width: 14px;
} }
.active .svg-icon { .active .svg-icon {
opacity: 0.88; opacity: 0.88;
} }
.middle { .middle {
padding: 0 16px; padding: 0 16px;
display: flex; display: flex;
align-items: center; align-items: center;
button { button {
margin: 0 8px; margin: 0 8px;
} }
button#play .svg-icon { button#play .svg-icon {
height: 28px; height: 28px;
width: 28px; width: 28px;
padding: 2px; padding: 2px;
} }
.svg-icon { .svg-icon {
opacity: 0.88; opacity: 0.88;
height: 22px; height: 22px;
@ -454,6 +543,7 @@ export default {
.cover-container { .cover-container {
position: relative; position: relative;
} }
img { img {
border-radius: 0.75em; border-radius: 0.75em;
width: 54vh; width: 54vh;
@ -461,6 +551,7 @@ export default {
user-select: none; user-select: none;
object-fit: cover; object-fit: cover;
} }
.shadow { .shadow {
position: absolute; position: absolute;
top: 12px; top: 12px;
@ -479,6 +570,7 @@ export default {
font-weight: 600; font-weight: 600;
color: var(--color-text); color: var(--color-text);
margin-right: 24px; margin-right: 24px;
.lyrics-container { .lyrics-container {
height: 100%; height: 100%;
display: flex; display: flex;
@ -487,32 +579,40 @@ export default {
max-width: 460px; max-width: 460px;
overflow-y: auto; overflow-y: auto;
transition: 0.5s; transition: 0.5s;
.line { .line {
padding: 18px; padding: 18px;
transition: 0.2s; transition: 0.2s;
border-radius: 12px; border-radius: 12px;
&:hover { &:hover {
background: var(--color-secondary-bg); background: var(--color-secondary-bg);
} }
span { span {
opacity: 0.28; opacity: 0.28;
cursor: default; cursor: default;
} }
} }
.line#line-1:hover { .line#line-1:hover {
background: unset; background: unset;
} }
.highlight span { .highlight span {
opacity: 0.98; opacity: 0.98;
transition: 0.5s; transition: 0.5s;
} }
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
display: none; display: none;
} }
.lyrics-container .line:first-child { .lyrics-container .line:first-child {
margin-top: 50vh; margin-top: 50vh;
} }
.lyrics-container .line:last-child { .lyrics-container .line:last-child {
margin-bottom: calc(50vh - 128px); margin-bottom: calc(50vh - 128px);
} }
@ -532,14 +632,16 @@ export default {
opacity: 0.28; opacity: 0.28;
transition: 0.2s; transition: 0.2s;
-webkit-app-region: no-drag; -webkit-app-region: no-drag;
.svg-icon { .svg-icon {
color: var(--color-text); color: var(--color-text);
padding-top: 5px; padding-top: 5px;
height: 22px; height: 22px;
width: 22px; width: 22px;
} }
&:hover { &:hover {
background: var(--color-secondary-bg); background: var(--color-secondary-bg-for-transparent);
opacity: 0.88; opacity: 0.88;
} }
} }
@ -556,6 +658,7 @@ export default {
.slide-up-leave-active { .slide-up-leave-active {
transition: all 0.4s; transition: all 0.4s;
} }
.slide-up-enter, .slide-up-leave-to /* .fade-leave-active below version 2.1.8 */ { .slide-up-enter, .slide-up-leave-to /* .fade-leave-active below version 2.1.8 */ {
transform: translateY(100%); transform: translateY(100%);
} }
@ -563,9 +666,11 @@ export default {
.slide-fade-enter-active { .slide-fade-enter-active {
transition: all 0.5s ease; transition: all 0.5s ease;
} }
.slide-fade-leave-active { .slide-fade-leave-active {
transition: all 0.5s cubic-bezier(0.2, 0.2, 0, 1); transition: all 0.5s cubic-bezier(0.2, 0.2, 0, 1);
} }
.slide-fade-enter, .slide-fade-enter,
.slide-fade-leave-to { .slide-fade-leave-to {
transform: translateX(27vh); transform: translateX(27vh);

@ -163,6 +163,24 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item">
<div class="left">
<div class="title">{{
$t("settings.showLyricsDynamicBackground")
}}</div>
</div>
<div class="right">
<div class="toggle">
<input
type="checkbox"
name="show-lyrics-dynamic-background"
id="show-lyrics-dynamic-background"
v-model="showLyricsDynamicBackground"
/>
<label for="show-lyrics-dynamic-background"></label>
</div>
</div>
</div>
<div class="item" v-if="isElectron && !isMac"> <div class="item" v-if="isElectron && !isMac">
<div class="left"> <div class="left">
<div class="title">{{ $t("settings.minimizeToTray") }}</div> <div class="title">{{ $t("settings.minimizeToTray") }}</div>
@ -447,6 +465,17 @@ export default {
}); });
}, },
}, },
showLyricsDynamicBackground: {
get() {
return this.settings.showLyricsDynamicBackground;
},
set(value) {
this.$store.commit("updateSettings", {
key: "showLyricsDynamicBackground",
value,
});
},
},
minimizeToTray: { minimizeToTray: {
get() { get() {
return this.settings.minimizeToTray; return this.settings.minimizeToTray;

Loading…
Cancel
Save