okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ciderapp:upcoming' into upcoming

Browse source
This commit is contained in:
yazninja 2022-01-25 13:43:16 +08:00 • committed by GitHub
commit 012dfb060b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 510 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/renderer/assets_sources/Cider.afdesign
View file

Binary file not shown.

BIN
src/renderer/assets_sources/logotmp.afdesign
View file

Binary file not shown.

1
src/renderer/style.less
View file

@ -3089,6 +3089,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
justify-content: space-between;
min-height: 400px;
position: relative;
pointer-events: none;
.header-content {
z-index: 1;

2
src/renderer/views/components/queue.ejs
View file

@ -33,7 +33,7 @@
</draggable>
</div>
<div class="queue-footer">
<button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">Clear All</button>
<button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}</button>
</div>
</div>
</script>

18
src/renderer/views/main.ejs
View file

@ -188,7 +188,7 @@
@focus="search.showHints = true"
@blur="setTimeout(()=>{search.showHints = false}, 300)"
v-on:keyup.enter="searchQuery();search.showHints = false" @change="showSearch();"
@input="getSearchHints()" placeholder="Search..." v-model="search.term"
@input="getSearchHints()" :placeholder="$root.getLz('term.search') + ' ...'" v-model="search.term"
ref="searchInput" class="search-input">
</div>
</div>
@ -247,7 +247,7 @@
<button class="usermenu-item" @click="toggleHideUserInfo()">
<div class="row nopadding">
<div class="col nopadding">
Show Personal Info
{{$root.getLz('settings.option.visual.showPersonalInfo')}}
</div>
<div class="col-auto nopadding" v-if="!chrome.hideUserInfo">
✔️
@ -257,7 +257,7 @@
<button class="usermenu-item" @click="mk.privateEnabled = !mk.privateEnabled">
<div class="row nopadding">
<div class="col nopadding">
Private Session
{{$root.getLz('term.privateSession')}}
</div>
<div class="col-auto nopadding" v-if="mk.privateEnabled">
✔️
@ -266,22 +266,22 @@
</button>
<button class="usermenu-item" v-if="cfg.advanced.AudioContext && cfg.audio.spatial"
@click="modals.spatialProperties = true">
Spatialized Audio Settings
{{$root.getLz('term.spacializedAudioSetting')}}
</button>
<button class="usermenu-item" @click="appRoute('apple-account-settings')">
Account Settings
{{$root.getLz('term.accountSettings')}}
</button>
<button class="usermenu-item" @click="appRoute('about')">
About
{{$root.getLz('term.about')}}
</button>
<button class="usermenu-item" @click="window.open('https://discord.gg/applemusic')">
Discord
{{$root.getLz('term.discord')}}
</button>
<button class="usermenu-item" @click="appRoute('settings')">
Settings
{{$root.getLz('term.settings')}}
</button>
<button class="usermenu-item" @click="unauthorize()">
Sign Out
{{$root.getLz('term.logout')}}
</button>
</div>
</div>

4
src/renderer/views/pages/artist.ejs
View file

@ -6,7 +6,7 @@
v-if="data.attributes.editorialVideo && (data.attributes.editorialVideo.motionArtistWide16x9 || data.attributes.editorialVideo.motionArtistFullscreen16x9)"
:video="data.attributes.editorialVideo.motionArtistWide16x9.video ?? (data.attributes.editorialVideo.motionArtistFullscreen16x9.video ?? '')">
</animatedartwork-view>
<div class="header-content">
<div class="header-content" style="pointer-events: all;">
<div class="row">
<div class="col-sm" style="width: auto;">
<div class="artist-image" v-if="!(data.attributes.editorialVideo && (data.attributes.editorialVideo.motionArtistWide16x9 || data.attributes.editorialVideo.motionArtistFullscreen16x9))">
@ -30,7 +30,7 @@
<h1>{{ data.attributes.name }}</h1>
</div>
</div>
<button class="more-btn-round" @click="artistMenu">
<button class="more-btn-round" @click="artistMenu" style="pointer-events: all;">
<div class="svg-icon"></div>
</button>
</div>

4
src/renderer/views/pages/cider-playlist.ejs
View file

@ -48,7 +48,7 @@
<div v-else-if="data.attributes.description.standard" class="content" v-html="data.attributes.description.standard"></div>
<button v-if="data.attributes.description.short" class="more-btn"
@click="editorialNotesExpanded = !editorialNotesExpanded">
{{app.getLz('term.more')}}
{{app.getLz('term.showMore')}}
</button>
</div>
</div>
@ -57,7 +57,7 @@
<div class="playlist-desc-expanded">
<div class="content"
v-html="((data.attributes.editorialNotes) ? (data.attributes.editorialNotes.standard ?? (data.attributes.editorialNotes.short ?? '') ) : (data.attributes.description ? (data.attributes.description.standard ?? (data.attributes.description.short ?? '')) : ''))"></div>
<button class="more-btn" @click="editorialNotesExpanded = !editorialNotesExpanded">{{app.getLz('term.less')}}
<button class="more-btn" @click="editorialNotesExpanded = !editorialNotesExpanded">{{app.getLz('term.showLess')}}
</button>
</div>
</template>