diff --git a/package.json b/package.json index 9926ed56..4890dae6 100644 --- a/package.json +++ b/package.json @@ -122,9 +122,9 @@ } ], "build": { - "electronVersion": "18.3.5", + "electronVersion": "19.0.8", "electronDownload": { - "version": "18.3.5+wvcus", + "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", diff --git a/resources/afterPack.js b/resources/afterPack.js index 8e3ff50f..16bdbee8 100644 --- a/resources/afterPack.js +++ b/resources/afterPack.js @@ -14,7 +14,7 @@ exports.default = function(context) { // console.log('Castlabs-evs update complete') // xcode 13 - if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64')) + if (fs.existsSync('dist/mac-universal--x64') && fs.existsSync('dist/mac-universal--arm64') && fs.existsSync('dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib')) execSync("cp 'dist/mac-universal--x64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib' 'dist/mac-universal--arm64/Cider.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Resources/MainMenu.nib/keyedobjects-101300.nib'",{stdio: 'inherit'}) // console.log('VMP signing start') diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index 1351ad46..c2bfe0b9 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -188,7 +188,7 @@ "term.plugin": "Plugin", "term.pluginMenu": "Plugins Menú", "term.pluginMenu.none": "Sin Plugins Interactivos", - "term.replay": "Repetir", + "term.replay": "Replay", "term.uniqueAlbums": "Álbumes Únicos", "term.uniqueArtists": "Artistas Únicos", "term.uniqueSongs": "Canciones Únicas", diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index d40a261c..de6b8d82 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -50,7 +50,7 @@ const CiderAudio = { connectContext: function (mediaElem) { if (!CiderAudio.context) { CiderAudio.context = new window.AudioContext({ sampleRate: 96000, latencyHint: "playback"}); // Don't ever remove the sample rate arg. Ask Maikiwi. - app.lyricOffset = CiderAudio.context.baseLatency + app.lyricOffset = CiderAudio.context.baseLatency + CiderAudio.context.outputLatency } if (!CiderAudio.source) { CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem); diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 347b1c3c..ca133d63 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -302,16 +302,23 @@ min-width: 120px; } } - + .categories{ + display: grid; + grid-template-columns: repeat(3, minmax(200px, 1fr)); + gap: 1rem; + } .cd-mediaitem-square.mediaitem-brick { - width: 530px !important; - + width: 100% !important; + height: 168px; + padding-block: 0.5rem; .artwork-container .artwork { height: 168px !important; - width: 507px !important; + width: 100% !important; z-index: 1; } - + .info-rect{ + height: max-content; + } .title { font-weight: bold; justify-content: left; diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 0cba8aa1..22a2dd4a 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -16,7 +16,6 @@ const app = new Vue({ drawertest: false, platform: "", mk: {}, - quickPlayQuery: "", pluginInstalled: false, pluginMenuEntries: [], lz: ipcRenderer.sendSync("get-i18n", "en_US"), @@ -131,16 +130,13 @@ const app = new Vue({ webremoteqr: "", mxmtoken: "", mkIsReady: false, - playerReady: false, animateBackground: false, currentArtUrl: '', currentArtUrlRaw: '', lyricon: false, currentTrackID: '', - currentTrackIDBG: '', lyrics: [], currentLyricsLine: 0, - lyriccurrenttime: 0, richlyrics: [], lyricsMediaItem: {}, lyricsDebug: { @@ -280,12 +276,6 @@ const app = new Vue({ }, false) }, methods: { - hotReload() { - this.appVisible = false - setTimeout(() => { - this.appVisible = true - }, 1000) - }, setWindowHash(route = "") { window.location.hash = `#${route}`; }, @@ -3945,7 +3935,7 @@ const app = new Vue({ if (width) { width = parseInt(width * window.devicePixelRatio) } - let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`; + let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900 || width === 380 || width === 600 ) ? "sr" : "cc"))}`; if (newurl.includes("900x516")) { newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr"); diff --git a/src/renderer/style.less b/src/renderer/style.less index d4345a6c..b974dca2 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3,7 +3,7 @@ @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100;300;400;500;700;900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100;300;400;500;700;900&display=swap"); -@import url("lib/quasar/quasar.min.css"); +// @import url("lib/quasar/quasar.min.css"); @import url("less/appvars.less"); @import url("less/bootstrap-vue.min.less"); @import url("less/ameframework.less"); diff --git a/src/renderer/views/components/listennow-child.ejs b/src/renderer/views/components/listennow-child.ejs index d885ebb2..8f7bcf6c 100644 --- a/src/renderer/views/components/listennow-child.ejs +++ b/src/renderer/views/components/listennow-child.ejs @@ -2,15 +2,18 @@
-
+
@@ -131,7 +131,9 @@

{{categoriesView[0].attributes.title.stringForDisplay ?? ""}}

- +
+ diff --git a/winget.json b/winget.json index 686e4ca7..1460f595 100644 --- a/winget.json +++ b/winget.json @@ -1,7 +1,7 @@ { - "electronVersion": "19.0.3", + "electronVersion": "19.0.8", "electronDownload": { - "version": "19.0.3+wvcus", + "version": "20.0.0-beta.11+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider",