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

Merge pull request #231 from gms10ur/upcoming

Browse source 
Daily PR - 27.01 (READY TO MERGE)
This commit is contained in:
cryptofyre 2022-01-27 07:26:46 -06:00 • committed by GitHub
commit 5422a70fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 127 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/banner.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Before After
Before After

20
src/i18n/en_HODOR.jsonc
View file

@ -108,6 +108,13 @@
"term.equalizer": "HODOR",
"term.reset": "HODOR",
"term.tracks": "HODOR", // Assume x amount of tracks. e.g. 50 tracks
"term.time.hours": "HODOR",
"term.time.hour": "HODOR",
"term.time.minutes": "HODOR",
"term.time.minute": "HODOR",
"term.time.seconds": "HODOR",
"term.time.second": "HODOR",
"term.funLanguages": "HODOR",
// Home
"home.title": "HODOR",
@ -172,6 +179,16 @@
"action.playTracksLater": "HODOR ${app.selectedMediaItems.length} HODOR HODOR",
"action.removeTracks": "HODOR ${self.selectedItems.length} HODOR HODOR HODOR",
// Settings - General (Reserved)
"settings.header.general": "HODOR HODOR",
"settings.header.general.description": "HODOR HODOR HODOR HODOR.",
"settings.option.general.language": "HODOR",
// Language optgroups
"settings.option.general.language.main": "HODOR",
"settings.option.general.language.fun": "HODOR HODOR",
"settings.option.general.language.unsorted": "HODOR",
// Settings - Audio
"settings.header.audio": "HODOR",
"settings.header.audio.description": "HODOR HODOR HODOR HODOR HODOR HODOR.",
@ -209,9 +226,6 @@
"settings.header.visual.hardwareAcceleration.webGPU": "HODOR!!",
// Refer to term.disabled for the disabled option
"settings.option.visual.showPersonalInfo": "HODOR HODOR HODOR?", // Toggle
// Settings - General (Reserved)
"settings.header.general": "HODOR",
"settings.header.general.description": "HODOR HODOR HODOR HODOR HODOR HODOR.",
// Settings - Lyrics
"settings.header.lyrics": "HODOR",

6
src/i18n/en_US.jsonc
View file

@ -182,11 +182,14 @@
// Settings - General
"settings.header.general": "General",
"settings.header.general.description": "Adjust the general settings for Cider.",
"settings.option.general.language": "Language",
// Language optgroups
"settings.option.general.language.main": "Languages",
"settings.option.general.language.fun": "Fun Languages",
"settings.option.general.language.unsorted": "Unsorted",
// Settings - Audio
"settings.header.audio": "Audio",
"settings.header.audio.description": "Adjust the audio settings for Cider.",
@ -224,9 +227,6 @@
"settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
// Refer to term.disabled for the disabled option
"settings.option.visual.showPersonalInfo": "Show Personal Info", // Toggle
// Settings - General (Reserved)
"settings.header.general": "General",
"settings.header.general.description": "Adjust the general settings for Cider.",
// Settings - Lyrics
"settings.header.lyrics": "Lyrics",

29
src/i18n/tr_TR.jsonc
View file

@ -1,10 +1,9 @@
{
// i18n Info
"i18n.languageName": "Türkçe", // name of language in native language
"i18n.languageNameEnglish": "Turkish", // name of language in English
"i18n.category": "main", // main = real language, fun = fun community languages
"i18n.authors": "gms10ur", // Authors, if you contribute to this file feel free to add your name seperated with a space
"i18n.authors": "@gms10ur", // Authors, if you contribute to this file feel free to add your name seperated with a space
// App info
"app.name": "Cider",
@ -97,7 +96,8 @@
"term.spacializedAudioSetting": "Uzamsal Ses Ayarları",
"term.clearAll": "Tümünü Temizle",
"term.recentStations": "Son İstasyonlar",
"term.language": "Dil Seçimi",
"term.language": "Dil",
"term.funLanguages": "Mizahi Diller",
"term.noLyrics": "Yükleniyor... / Şarkı Sözü Bulunamadı./ Enstrumantal.",
"term.copyright": "Copyright",
"term.rightsReserved": "Tüm Haklası Saklıdır.",
@ -109,6 +109,12 @@
"term.equalizer": "Ekolayzer",
"term.reset": "Sıfırla",
"term.tracks": "adet şarkı", // Assume x amount of tracks. e.g. 50 tracks
"term.time.hours": "saat",
"term.time.hour": "saat",
"term.time.minutes": "dakika",
"term.time.minute": "dakika",
"term.time.seconds": "saniye",
"term.time.second": "saniye",
// Home
"home.title": "Ana Sayfa",
@ -174,6 +180,15 @@
"action.playTracksLater": "En Son ${app.selectedMediaItems.length} şarkıları çal",
"action.removeTracks": "Sıradan ${self.selectedItems.length} şarkıları kaldır",
// Settings - General (Reserved)
"settings.header.general": "Genel Ayarlar",
"settings.header.general.description": "Genel ayarları buradan düzenleyin.",
"settings.option.general.language": "Dil Seçeneği",
// Language optgroups
"settings.option.general.language.main": "Gerçek Diller",
"settings.option.general.language.fun": "Mizahi Diller",
"settings.option.general.language.unsorted": "Henüz Tamamlanmamış Diller",
// Settings - Audio
"settings.header.audio": "Çalma / Oynatma",
@ -184,7 +199,7 @@
"settings.header.audio.quality.auto": "Otomatik",
"settings.option.audio.seamlessTransition": "Kesintisiz Ses Geçişi", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "Gelişmiş Ses Deneyimi", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "Gelişmiş ses deneyiminin etkinleştirilmesi, Ses Normalleştirme, Ekolayzer ve Görselleştirici gibi genişletilmiş ses özelliklerine izin verir, ancak bazı sistemlerde bu, seste bozulmalara neden olabilir.",
"settings.option.audio.enableAdvancedFunctionality.description": "Gelişmiş ses deneyiminin etkinleştirilmesi, Ses Normalleştirme, Ekolayzer ve Görselleştirici gibi genişletilmiş ses özelliklerine izin verir, ancak bu durum bazı sistemlerde seste bozulmalara neden olabilir.",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Ses Normalleştirme", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Ses normalleştirme alçak ve yüksek sesli şarkıları dengeler ve daha düzgün bir dinleme deneyimi sağlar.",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Uzamsal Ses", // Toggle
@ -214,10 +229,6 @@
// Refer to term.disabled for the disabled option
"settings.option.visual.showPersonalInfo": "Kullanıcı Adımı Göster", // Toggle
// Settings - General (Reserved)
"settings.header.general": "Genel Ayarlar",
"settings.header.general.description": "Genel ayarları buradan düzenleyin.",
// Settings - Lyrics
"settings.header.lyrics": "Şarkı Sözleri",
"settings.header.lyrics.description": "Cider'in şarkı sözlerini nasıl görüntülemesini istediğini buradan ayarlayın.",
@ -235,6 +246,8 @@
"settings.header.connectivity.discordRPC.appleMusic": "'Apple Music' Olarak",
"settings.option.connectivity.discordRPC.clearOnPause": "Duraklatıldığında Discord'da Gösterme", // Toggle
"settings.option.connectivity.lastfmScrobble": "LastFM Bağlantısı", // Option to Connect
"settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobblalma Yüzdesi (%)",
"settings.option.connectivity.lastfmScrobble.nowPlaying": "Şimdi çalan şarkıyı LastFM'de göster",
"settings.option.connectivity.lastfmScrobble.removeFeatured": "Albüm sanatçısını Scrobbledan kaldır(LastFM)",
"settings.option.connectivity.lastfmScrobble.filterLoop": "Tekrar edilen şarkıyı filtrele (LastFM)",
// Refer to term.connect for the connect button

33
src/renderer/assets/repeatOne.svg Normal file
View file

@ -0,0 +1,33 @@
<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill="white" version="1.1">
<g>
<title>Layer 1</title>
<g id="svg_1">
<g id="svg_2">
<g id="svg_3">
<path id="svg_4" d="m482.197,374.266l-78.717,-45.448c-15.89,-9.174 -35.829,2.308 -35.829,20.686l0,27.587l-216.593,0c-63.597,-0.001 -115.337,-51.74 -115.337,-115.338c0,-9.864 -7.997,-17.86 -17.86,-17.86c-9.864,0 -17.86,7.997 -17.86,17.86c0,83.294 67.765,151.058 151.058,151.058l216.591,0l0,27.587c0,18.347 19.913,29.876 35.829,20.686l78.717,-45.447c15.89,-9.172 15.917,-32.181 0.001,-41.371z"/>
<path id="svg_5" d="m360.942,99.189l-216.593,0l0,-27.588c0,-18.347 -19.913,-29.876 -35.829,-20.686l-78.717,45.447c-15.889,9.173 -15.917,32.182 0,41.372l78.717,45.448c15.89,9.174 35.829,-2.309 35.829,-20.686l0,-27.587l216.593,0c63.598,0 115.337,51.739 115.337,115.337c0,9.864 7.997,17.86 17.86,17.86c9.864,0 17.86,-7.997 17.86,-17.86c0.001,-83.293 -67.764,-151.057 -151.057,-151.057z"/>
</g>
</g>
</g>
<g id="svg_6"/>
<g id="svg_7"/>
<g id="svg_8"/>
<g id="svg_9"/>
<g id="svg_10"/>
<g id="svg_11"/>
<g id="svg_12"/>
<g id="svg_13"/>
<g id="svg_14"/>
<g id="svg_15"/>
<g id="svg_16"/>
<g id="svg_17"/>
<g id="svg_18"/>
<g id="svg_19"/>
<g id="svg_20"/>
<g id="svg_24">
<path id="svg_21" d="m118,511.5c-65.19337,0 -118,-52.80663 -118,-118c0,-65.19337 52.80663,-118 118,-118c65.19337,0 118,52.80663 118,118c0,65.19337 -52.80663,118 -118,118z" opacity="undefined" stroke-width="0" stroke="#000" fill="#fff"/>
<text font-weight="bold" xml:space="preserve" text-anchor="start" font-family="Noto Sans JP" font-size="250" id="svg_23" y="470" x="54.64063" stroke-width="0" stroke="#000" fill="#000000">1</text>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

4
src/renderer/js/WSAPI_Interop.js
View file

@ -98,9 +98,9 @@ const wsapi = {
},
toggleRepeat() {
if(MusicKit.getInstance().repeatMode == 0) {
MusicKit.getInstance().repeatMode = 2
}else if(MusicKit.getInstance().repeatMode == 2){
MusicKit.getInstance().repeatMode = 1
}else if(MusicKit.getInstance().repeatMode == 1){
MusicKit.getInstance().repeatMode = 2
}else{
MusicKit.getInstance().repeatMode = 0
}

9
src/renderer/style.less
View file

@ -1516,7 +1516,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
.playback-button--small.active {
background-color: rgb(200 200 200 / 10%);
background-color: rgb(200 200 200 / 25%);
}
.playback-button--small.search {
@ -1548,7 +1548,8 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
.playback-button--small.repeat.repeatOne {
background-color: var(--keyColor);
background-color: rgb(200 200 200 / 25%);
background-image: url("./assets/repeatOne.svg");
}
.playback-button.pause {
@ -4434,7 +4435,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
.playback-button--small.active {
background-color: rgba(200, 200, 200, 0.7);
background-color: rgb(200 200 200 / 25%);
}
.playback-button--small {
@ -4799,7 +4800,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
.playback-button--small.active {
background-color: rgba(200, 200, 200, 0.7);
background-color: rgb(200 200 200 / 25%);
}
.player-exit {

4
src/renderer/views/components/fullscreen.ejs
View file

@ -71,9 +71,9 @@
<div class="app-chrome-item">
<button class="playback-button--small repeat" v-if="app.mk.repeatMode == 0"
@click="app.mk.repeatMode = 1"></button>
<button class="playback-button--small repeat active" @click="app.mk.repeatMode = 2"
<button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 2"
v-else-if="app.mk.repeatMode == 1"></button>
<button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 0"
<button class="playback-button--small repeat active" @click="app.mk.repeatMode = 0"
v-else-if="app.mk.repeatMode == 2"></button>
</div>
</div>

4
src/renderer/views/components/miniplayer.ejs
View file

@ -74,9 +74,9 @@
<div class="app-chrome-item">
<button class="playback-button--small repeat" v-if="app.mk.repeatMode == 0"
@click="app.mk.repeatMode = 1"></button>
<button class="playback-button--small repeat active" @click="app.mk.repeatMode = 2"
<button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 2"
v-else-if="app.mk.repeatMode == 1"></button>
<button class="playback-button--small repeat repeatOne" @click="app.mk.repeatMode = 0"
<button class="playback-button--small repeat active" @click="app.mk.repeatMode = 0"
v-else-if="app.mk.repeatMode == 2"></button>
</div>
</div>

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

@ -71,9 +71,9 @@
<div class="app-chrome-item display--large">
<button class="playback-button--small repeat" v-if="mk.repeatMode == 0"
@click="mk.repeatMode = 1"></button>
<button class="playback-button--small repeat active" @click="mk.repeatMode = 2"
<button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
v-else-if="mk.repeatMode == 1"></button>
<button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 0"
<button class="playback-button--small repeat active" @click="mk.repeatMode = 0"
v-else-if="mk.repeatMode == 2"></button>
</div>
</div>
@ -316,9 +316,9 @@
<div class="app-chrome-item">
<button class="playback-button--small repeat" v-if="mk.repeatMode == 0"
@click="mk.repeatMode = 1"></button>
<button class="playback-button--small repeat active" @click="mk.repeatMode = 2"
<button class="playback-button--small repeat repeatOne" @click="mk.repeatMode = 2"
v-else-if="mk.repeatMode == 1"></button>
<button class="playback-button--small repeat repeatOne"
<button class="playback-button--small repeat active"
@click="mk.repeatMode = 0" v-else-if="mk.repeatMode == 2"></button>
</div>
</div>

27
src/web-remote/assets/repeatOne.svg Normal file
View file

@ -0,0 +1,27 @@
<svg width="60" height="60" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" version="1.1">
<g>
<title>Layer 1</title>
<g id="svg_1">
<path id="svg_2" d="m42,12l-21.586,0l7.293,-7.293c0.391,-0.391 0.391,-1.023 0,-1.414s-1.023,-0.391 -1.414,0l-8.999,8.999c-0.093,0.092 -0.166,0.203 -0.217,0.326c-0.101,0.244 -0.101,0.52 0,0.764c0.051,0.123 0.124,0.234 0.217,0.326l8.999,8.999c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293c0.391,-0.391 0.391,-1.023 0,-1.414l-7.293,-7.293l21.586,0c8.822,0 16,7.178 16,16c0,4.252 -1.668,8.264 -4.696,11.295c-0.391,0.391 -0.391,1.024 0,1.414c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293c3.406,-3.409 5.282,-7.923 5.282,-12.709c0,-9.925 -8.075,-18 -18,-18z" fill="white"/>
<path id="svg_3" d="m35.707,37.293c-0.391,-0.391 -1.023,-0.391 -1.414,0s-0.391,1.023 0,1.414l7.293,7.293l-23.586,0c-8.822,0 -16,-7.178 -16,-16c0,-3.783 1.359,-7.46 3.828,-10.354c0.358,-0.421 0.309,-1.052 -0.111,-1.41c-0.419,-0.359 -1.052,-0.31 -1.41,0.111c-2.778,3.257 -4.307,7.394 -4.307,11.653c0,9.925 8.075,18 18,18l23.586,0l-7.293,7.293c-0.391,0.391 -0.391,1.023 0,1.414c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293l9,-9c0.391,-0.391 0.391,-1.023 0,-1.414l-9,-9z" fill="white"/>
</g>
<g id="svg_4"/>
<g id="svg_5"/>
<g id="svg_6"/>
<g id="svg_7"/>
<g id="svg_8"/>
<g id="svg_9"/>
<g id="svg_10"/>
<g id="svg_11"/>
<g id="svg_12"/>
<g id="svg_13"/>
<g id="svg_14"/>
<g id="svg_15"/>
<g id="svg_16"/>
<g id="svg_17"/>
<g id="svg_18"/>
<ellipse stroke="#000" stroke-width="0" ry="21" rx="22" id="svg_19" cy="30" cx="30" fill="#fff"/>
<text transform="matrix(1 0 0 1 0 0)" style="cursor: move;" font-weight="bold" xml:space="preserve" text-anchor="start" font-family="'Inter'" font-size="48" id="svg_21" y="44" x="18" stroke-width="0" stroke="#fff" fill="#000000">1</text>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

5
src/web-remote/style.css
View file

@ -255,7 +255,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
}
.playback-button--small.active {
background-color: rgb(200 200 200 / 10%);
background-color: rgb(200 200 200 / 25%);
}
.playback-button--small.activeColor {
@ -287,7 +287,8 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
}
.playback-button--small.repeat.repeatOne {
background-color: var(--keyColor);
background-color: rgb(200 200 200 / 25%);
background-image: url("./assets/repeatOne.svg");
}
.playback-button.pause {

8
src/web-remote/views/index.ejs
View file

@ -39,10 +39,10 @@
<button class="md-btn playback-button next" @click="next()"></button>
<button class="md-btn playback-button--small repeat" @click="repeat()"
v-if="player.currentMediaItem.repeatMode == 0"></button>
<button class="md-btn playback-button--small repeat active" @click="repeat()"
v-else-if="player.currentMediaItem.repeatMode == 2"></button>
<button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
v-else-if="player.currentMediaItem.repeatMode == 1"></button>
<button class="md-btn playback-button--small repeat active" @click="repeat()"
v-else-if="player.currentMediaItem.repeatMode == 2"></button>
</div>
</div>
</template>
@ -161,10 +161,10 @@
<button class="md-btn playback-button next" @click="next()"></button>
<button class="md-btn playback-button--small repeat" @click="repeat()"
v-if="player.currentMediaItem.repeatMode == 0"></button>
<button class="md-btn playback-button--small repeat active" @click="repeat()"
v-else-if="player.currentMediaItem.repeatMode == 2"></button>
<button class="md-btn playback-button--small repeat repeatOne" @click="repeat()"
v-else-if="player.currentMediaItem.repeatMode == 1"></button>
<button class="md-btn playback-button--small repeat active" @click="repeat()"
v-else-if="player.currentMediaItem.repeatMode == 2"></button>
</div>
<div class="md-footer">
<div class="row volume-slider-container">