From 3b4d9d5512b9ec561d6d95b6e9062cae003dc894 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Wed, 16 Feb 2022 20:04:45 -0800 Subject: [PATCH 01/17] Added OpenAppData button in settings and updated layout/translations --- src/i18n/README.md | 7 ++- src/i18n/en_US.jsonc | 12 ++++-- src/main/base/browserwindow.ts | 4 +- src/renderer/assets/feather/external-link.svg | 1 + src/renderer/views/pages/settings.ejs | 43 ++++++++++++++----- 5 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 src/renderer/assets/feather/external-link.svg diff --git a/src/i18n/README.md b/src/i18n/README.md index 6552894c..3b5b7d1d 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -121,4 +121,9 @@ Update 16/02/2022 21:45 UTC * `term.audioControls`: Added for `en_US`. * `settings.option.audio.volumeStep`: Added for `en_US`. -* `settings.option.audio.maxVolume`: Added for `en_US`.` \ No newline at end of file +* `settings.option.audio.maxVolume`: Added for `en_US`.` + +Update 17/02/2022 10:00 UTC ++ `settings.header.debug`: Added for `en_US`. ++ `settings.option.debug.copy_log`: Replaces `settings.option.experimental.copy_log`. ++ `settings.option.debug.openAppData`: Added for `en_US` \ No newline at end of file diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 037cbe9c..a14377d8 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -231,7 +231,7 @@ "action.copy": "Copy", "action.newpreset": "New Preset...", // Equalizer Preset "action.deletepreset": "Delete Preset", - + "action.open": "Open", // Settings - General "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", @@ -339,13 +339,19 @@ "settings.option.connectivity.lastfmScrobble.removeFeatured": "Remove featuring artists from song title (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.fm)", // Refer to term.connect for the connect button - + + // Settings - Debug + "settings.header.debug": "Debug", + "settings.option.debug.copy_log": "Copy logs to clipboard", + "settings.option.debug.openAppData": "Open Cider Folder", + + // Settings - Experimental "settings.header.experimental": "Experimental", "settings.header.experimental.description": "Adjust the experimental settings for Cider.", "settings.option.experimental.compactUI": "Compact UI", // Toggle "settings.option.experimental.close_button_hide": "Close Button Should Hide the Application", - "settings.option.experimental.copy_log": "Copy logs to clipboard", + "settings.option.experimental.inline_playlists": "Inline Playlists and Albums", // Refer to term.disabled & term.enabled diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index a586b662..65a24a4b 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -699,7 +699,9 @@ export class BrowserWindow { ipcMain.on('get-version', (_event) => { _event.returnValue = app.getVersion() }); - + ipcMain.on('open-appdata', (_event) => { + shell.openPath(app.getPath('userData')); + }); /* ********************************************************************************************* * Window Events * **********************************************************************************************/ diff --git a/src/renderer/assets/feather/external-link.svg b/src/renderer/assets/feather/external-link.svg new file mode 100644 index 00000000..6236df3e --- /dev/null +++ b/src/renderer/assets/feather/external-link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 32a50e46..5c51f5ab 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -620,6 +620,36 @@ + + + +
+ {{$root.getLz('settings.header.debug')}} +
+
+
+
+ {{$root.getLz('settings.option.debug.copy_log')}} +
+
+ +
+
+
+
+ {{$root.getLz('settings.option.debug.openAppData')}} +
+
+ +
+
+
+ +
{{$root.getLz('settings.header.experimental')}}
@@ -692,16 +722,6 @@ -
-
- {{$root.getLz('settings.option.experimental.copy_log')}} -
-
- -
-
@@ -791,6 +811,9 @@ ipcRenderer.send('fetch-log') notyf.success(app.getLz('term.share.success')); }, + openAppData() { + ipcRenderer.send('open-appdata') + }, getLanguages: function () { let langs = this.$root.lzListing let categories = { From 4b6fdd4a4c653135c8e66acc6dc30cf646c91de9 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Wed, 16 Feb 2022 20:06:55 -0800 Subject: [PATCH 02/17] change in translation README.md --- src/i18n/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 3b5b7d1d..72e15e8b 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -126,4 +126,5 @@ Update 16/02/2022 21:45 UTC Update 17/02/2022 10:00 UTC + `settings.header.debug`: Added for `en_US`. + `settings.option.debug.copy_log`: Replaces `settings.option.experimental.copy_log`. -+ `settings.option.debug.openAppData`: Added for `en_US` \ No newline at end of file ++ `settings.option.debug.openAppData`: Added for `en_US` ++ `action.open`: Added for `en_US` \ No newline at end of file From 2d7cc20b6913cfc9cb9d027ab6638590833ee0ca Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Wed, 16 Feb 2022 23:00:16 -0800 Subject: [PATCH 03/17] margin: 0 on song-progress --- src/renderer/style.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/style.less b/src/renderer/style.less index 4b4d957c..55173ca4 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1220,6 +1220,7 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl height: 4px; background-color: rgb(200 200 200 / 10%); border-radius: 2px; + margin: 0; &::-webkit-slider-thumb { opacity: 0; From e091287bd6450e37095d4f3fbe1da29c70c06461 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Thu, 17 Feb 2022 14:12:23 +0700 Subject: [PATCH 04/17] fix np navigation on some songs --- src/renderer/index.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 7daf7bb8..0a7d0254 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -1354,8 +1354,15 @@ const app = new Vue({ } }, async getNowPlayingItemDetailed(target) { - let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind, (app.mk.nowPlayingItem.songId == -1), (app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"], {"include[songs]": "albums,artists", l : app.mklang}); - app.searchAndNavigate(u.data.data[0], target) + try { + let u = await app.mkapi(app.mk.nowPlayingItem.playParams.kind, + (app.mk.nowPlayingItem.songId == -1), + (app.mk.nowPlayingItem.songId != -1) ? app.mk.nowPlayingItem.songId : app.mk.nowPlayingItem["id"], + { "include[songs]": "albums,artists", l: app.mklang }); + app.searchAndNavigate(u.data.data[0], target) + } catch (e) { + app.searchAndNavigate(app.mk.nowPlayingItem, target) + } }, async searchAndNavigate(item, target) { let self = this From 90ad36d2561abc3b81793e04bfa22f4d5cecc314 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 17 Feb 2022 00:43:19 -0800 Subject: [PATCH 05/17] enables native linux chrome --- src/main/base/browserwindow.ts | 10 ++++++++++ src/renderer/less/linux.less | 6 ++++++ src/renderer/style.less | 1 + 3 files changed, 17 insertions(+) create mode 100644 src/renderer/less/linux.less diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 65a24a4b..ec199479 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -125,6 +125,16 @@ export class BrowserWindow { this.options.width = windowState.width; this.options.height = windowState.height; + switch(process.platform) { + default: + + break; + case "linux": + this.options.autoHideMenuBar = true + this.options.frame = true + break; + } + // Start the webserver for the browser window to load this.startWebServer(); diff --git a/src/renderer/less/linux.less b/src/renderer/less/linux.less new file mode 100644 index 00000000..6b26d1ee --- /dev/null +++ b/src/renderer/less/linux.less @@ -0,0 +1,6 @@ +// Linux +body[platform="linux"] { + #window-controls-container { + display: none; + } +} \ No newline at end of file diff --git a/src/renderer/style.less b/src/renderer/style.less index 55173ca4..ccce4639 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3156,4 +3156,5 @@ body[platform='darwin'] { } +@import url("less/linux.less"); @import url("less/compact.less"); From 6f975a3394b41eee0c52f18f30a9b3b0247acf86 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 17 Feb 2022 01:56:13 -0800 Subject: [PATCH 06/17] replay wip --- src/main/base/browserwindow.ts | 1 + src/renderer/less/pages.less | 24 +++++++ src/renderer/style.less | 11 +++ src/renderer/views/app/app-content.ejs | 7 ++ src/renderer/views/pages/home.ejs | 9 ++- src/renderer/views/pages/replay.ejs | 95 ++++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 src/renderer/views/pages/replay.ejs diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index ec199479..8e079151 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -47,6 +47,7 @@ export class BrowserWindow { "pages/library-videos", "pages/remote-pair", "pages/themes-github", + "pages/replay", "components/mediaitem-artwork", "components/artwork-material", "components/menu-panel", diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index f95f07e4..10c67d24 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -819,3 +819,27 @@ margin: 16px; } } + +// Replay +.replay-page { + --replayGradient: linear-gradient(45deg, hsl(248deg 58% 29%), hsl(13deg 41% 42%)); + --replayTextShadow: 0px 3px 2px #6f3f52; + + .replay-viewport { + background: var(--replayGradient); + padding: 16px 40px; + border-radius: 10px; + box-shadow: var(--mediaItemShadow), var(--mediaItemShadow-Shadow); + color: rgb(238 238 238 / 86%); + + .replay-header { + text-align: center; + font-size: 3em; + text-shadow: var(--replayTextShadow); + } + } + .replay-card { + background: transparent; + border:0px; + } +} \ No newline at end of file diff --git a/src/renderer/style.less b/src/renderer/style.less index ccce4639..31fa21bf 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -2757,6 +2757,17 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { /* Transitions */ +.replaycard-enter-active, +.replaycard-leave-active { + transition: opacity .5s var(--appleEase), transform .5s var(--appleEase); +} + +.replaycard-enter, +.replaycard-leave-to { + opacity: 0; + transform: translateY(20px); +} + .modal-enter-active, .modal-leave-active { transition: opacity .1s var(--appleEase), transform .1s var(--appleEase); diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs index 1ebbd22e..b64e3f7d 100644 --- a/src/renderer/views/app/app-content.ejs +++ b/src/renderer/views/app/app-content.ejs @@ -172,4 +172,11 @@ + + + + +
\ No newline at end of file diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs index 226dc360..e278248c 100644 --- a/src/renderer/views/pages/home.ejs +++ b/src/renderer/views/pages/home.ejs @@ -51,7 +51,14 @@
-

{{app.getLz('home.madeForYou')}}

+
+
+

{{app.getLz('home.madeForYou')}}

+
+
+ +
+
diff --git a/src/renderer/views/pages/replay.ejs b/src/renderer/views/pages/replay.ejs new file mode 100644 index 00000000..b41eb62d --- /dev/null +++ b/src/renderer/views/pages/replay.ejs @@ -0,0 +1,95 @@ + + \ No newline at end of file From 4e569365f8126f61937862f3d5c8f9d951a73b31 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 17 Feb 2022 02:08:28 -0800 Subject: [PATCH 07/17] replay, added this year --- .../views/components/listitem-horizontal.ejs | 6 +++++- .../views/components/mediaitem-list-item.ejs | 3 +++ src/renderer/views/pages/replay.ejs | 17 +++++++++-------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/renderer/views/components/listitem-horizontal.ejs b/src/renderer/views/components/listitem-horizontal.ejs index a8df81f4..0ee1bfaa 100644 --- a/src/renderer/views/components/listitem-horizontal.ejs +++ b/src/renderer/views/components/listitem-horizontal.ejs @@ -3,7 +3,7 @@
@@ -19,6 +19,10 @@ items: { type: Array, required: true + }, + "show-library-status": { + type: Boolean, + default: true } }, data: function () { diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs index fc671c53..44288389 100644 --- a/src/renderer/views/components/mediaitem-list-item.ejs +++ b/src/renderer/views/components/mediaitem-list-item.ejs @@ -74,6 +74,9 @@
{{ msToMinSec(item.attributes.durationInMillis ?? 0) }}
+
+ {{ item.attributes.playCount }} +
diff --git a/src/renderer/views/pages/replay.ejs b/src/renderer/views/pages/replay.ejs index b41eb62d..7cb9c60c 100644 --- a/src/renderer/views/pages/replay.ejs +++ b/src/renderer/views/pages/replay.ejs @@ -1,8 +1,8 @@