From db80697a8f7cac63f32efd0ab3810c2140a10ee4 Mon Sep 17 00:00:00 2001 From: yazninja Date: Mon, 24 Jan 2022 18:19:17 +0800 Subject: [PATCH 1/7] fix overlapping items in playback-info --- src/renderer/style.less | 47 ++++++++++++++++++++----------------- src/renderer/views/main.ejs | 15 +++++++++++- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/renderer/style.less b/src/renderer/style.less index 2511b9fe..0c4e99db 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1112,27 +1112,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { } -.app-chrome .app-chrome-item > .app-playback-controls .song-artist { - font-weight: 400; - font-size: 12px; - text-align: center; - /*height: 1.2em; - line-height: 1.2em;*/ - z-index: 1; - max-width: 360px; - - - .song-artist-normal { - height: inherit; - } - - &.song-artist-marquee { - > marquee { - margin-bottom: -3px; - } - } -} .app-chrome .app-chrome-item > .app-playback-controls .song-progress { @bgColor: transparent; @@ -1256,7 +1236,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { overflow: hidden; } -.app-chrome .app-chrome-item > .app-playback-controls .playback-info > div { +.app-chrome .app-chrome-item > .app-playback-controls .playback-info > .song-progress{ width: 100%; } @@ -1267,6 +1247,31 @@ input[type=range].web-slider::-webkit-slider-runnable-track { display: flex; position: relative; } +.app-chrome .app-chrome-item > .app-playback-controls .song-artist-album { + font-weight: 400; + font-size: 12px; + text-align: center; + /*height: 1.2em; + line-height: 1.2em;*/ + + z-index: 1; + align-items: center; + justify-content: center; + width: 80%; + max-width: 340px; + overflow: hidden; + + + .song-artist-normal { + height: inherit; + } + + &.song-artist-marquee { + > marquee { + margin-bottom: -3px; + } + } +} .display--small { display: none !important; diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 972027a6..ad72e94d 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -96,7 +96,7 @@ style="display: inline-block"> -
@@ -788,6 +788,19 @@ <%- include('components/miniplayer') %> + From e2f3647d97159aa482e4c7462d3452ffcb4f27b6 Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Tue, 25 Jan 2022 00:21:24 +0800 Subject: [PATCH 2/7] Remove js Put in index.js --- src/renderer/views/main.ejs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 355494c4..2d6d22eb 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -788,19 +788,6 @@ <%- include('components/miniplayer') %> - @@ -819,4 +806,4 @@ src="./js/WSAPI_Interop.js"> - \ No newline at end of file + From dc6f56e04f38d22795a98946121ad63411aa3b15 Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Tue, 25 Jan 2022 00:25:33 +0800 Subject: [PATCH 3/7] Add js for marquee (non-functional atm) --- src/renderer/index.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 14462aa9..8d0a76c7 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3373,7 +3373,16 @@ const app = new Vue({ //this.modals.qrcode = true; } - + function checkMarquee(){ + if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) { + document.getElementsByClassName('song-artist')[0].classList.add('marquee'); + document.getElementsByClassName('song-artist')[1].classList.add('marquee-after'); + } + if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) { + document.getElementsByClassName('song-name')[0].classList.add('marquee'); + document.getElementsByClassName('song-name')[1].classList.add('marquee-after'); + } + } } }) @@ -3663,4 +3672,4 @@ document.addEventListener('keydown', function(event) { ipcRenderer.send('detachDT','') } catch (e) { } } -}); \ No newline at end of file +}); From 22839db793100a4a3f581eef9fb61af9cb9b398d Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 18:05:14 -0800 Subject: [PATCH 4/7] A bunch of i18n changes (#207) * Syncing languages with latest US * date format template + connection error message * Added new strings + Substituted some menu item i18n --- src/i18n/en_GB.jsonc | 2 ++ src/i18n/en_US.jsonc | 7 ++++++- src/i18n/ja_JP.jsonc | 22 +++++++++++++++++++-- src/i18n/zh_CN.jsonc | 18 +++++++++++++++++ src/i18n/zh_HK.jsonc | 2 ++ src/i18n/zh_TW.jsonc | 19 +++++++++++++++++- src/renderer/views/components/queue.ejs | 2 +- src/renderer/views/main.ejs | 18 ++++++++--------- src/renderer/views/pages/cider-playlist.ejs | 4 ++-- 9 files changed, 78 insertions(+), 16 deletions(-) diff --git a/src/i18n/en_GB.jsonc b/src/i18n/en_GB.jsonc index 0788726a..1b5fdd9f 100644 --- a/src/i18n/en_GB.jsonc +++ b/src/i18n/en_GB.jsonc @@ -1,3 +1,5 @@ { + "date.format": "${d} ${m}, ${y}", + "home.friendsListeningTo": "Bruv's Listening To" } \ No newline at end of file diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 31ffff52..2499978b 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -1,6 +1,9 @@ { // Base File // App info "app.name": "Cider", + + "date.format": "${m} ${d}, ${y}", + // Dialogs "dialog.cancel": "Cancel", "dialog.ok": "OK", @@ -9,6 +12,7 @@ "notification.updatingLibrarySongs": "Updating library songs...", "notification.updatingLibraryAlbums": "Updating library albums...", "notification.updatingLibraryArtists": "Updating library artists...", + "notification.connectionError": "There was a problem connecting to Apple Music.", // Terms "term.appleMusic": "Apple Music", @@ -80,7 +84,8 @@ "term.time.updated": "Updated", "term.fullscreenView": "Fullscreen View", "term.defaultView": "Default View", - + "term.spacializedAudioSetting": "Spacialized Audio Setting", + "term.clearAll": "Clear All", // Home "home.title": "Home", diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index 60ac26a5..7da1f480 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -1,6 +1,9 @@ { // App info "app.name": "Cider", + + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "キャンセル", "dialog.ok": "OK", @@ -9,6 +12,7 @@ "notification.updatingLibrarySongs": "ライブラリの更新中...", "notification.updatingLibraryAlbums": "ライブラリの更新中...", "notification.updatingLibraryArtists": "ライブラリの更新中...", + "notification.connectionError": "Apple Musicに接続できません。", // Terms "term.appleMusic": "Apple Music", // Follows brand term @@ -43,7 +47,7 @@ "term.unmute": "ミュート解除", "term.share": "共有", "term.settings": "設定", - "term.seeAll": "すべてを表示", + "term.seeAll": "すべて見る", "term.sortBy": "並べ替え", "term.sortBy.album": "アルバム", "term.sortBy.artist": "アーティスト", @@ -64,6 +68,20 @@ "term.enabled": "ON", "term.disabled": "OFF", "term.connect": "接続", + "term.confirm": "よろしいでしょうか？", + "term.more": "もっと", + "term.less": "減らす", + "term.showMore": "もっと見る", + "term.showLess": "表示数を少なくする", + "term.topSongs" : "人気曲", + "term.latestReleases": "ニューリリース", + "term.time.added": "追加日", + "term.time.released": "配信開始日", + "term.time.updated": "最終更新日", + "term.fullscreenView": "全画面表示", + "term.defaultView": "ウィンドウ表示", + "term.spacializedAudioSetting": "オーディオ空間化設定", + "term.clearAll": "クリア", // Home "home.title": "ホーム", @@ -170,6 +188,6 @@ // Web Remote "remote.web.title": "Cider リモート", - "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする", + "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする" } diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index 44afaaf8..e1d58b83 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -1,6 +1,9 @@ { // App info "app.name": "Cider", + + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "取消", "dialog.ok": "确定", @@ -9,6 +12,7 @@ "notification.updatingLibrarySongs": "正在更新资料库的歌曲信息...", "notification.updatingLibraryAlbums": "正在更新资料库的专辑信息...", "notification.updatingLibraryArtists": "正在更新资料库的艺人信息...", + "notification.connectionError": "无法连接到 Apple Music。", // Terms "term.appleMusic": "Apple Music", // Follows brand term @@ -64,6 +68,20 @@ "term.enabled": "已启用", "term.disabled": "已禁用", "term.connect": "连接", + "term.confirm": "确认？", + "term.more": "更多", + "term.less": "较少", + "term.showMore": "显示更多", + "term.showLess": "显示更少", + "term.topSongs" : "热门歌曲", + "term.latestReleases": "最新发行", + "term.time.added": "添加于", + "term.time.released": "发行于", + "term.time.updated": "更新于", + "term.fullscreenView": "全屏", + "term.defaultView": "默认", + "term.spacializedAudioSetting": "音频空间化设置", + "term.clearAll": "清空", // Home "home.title": "主页", diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index f9b1e609..3d71573d 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -2,6 +2,8 @@ // App info "app.name": "Cider", + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "取消", "dialog.ok": "確認", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index f8ae2145..eb5d76a5 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -2,6 +2,8 @@ // App info "app.name": "Cider", + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "取消", "dialog.ok": "OK", @@ -10,6 +12,7 @@ "notification.updatingLibrarySongs": "正在更新資料庫的歌曲...", "notification.updatingLibraryAlbums": "正在更新資料庫的專輯...", "notification.updatingLibraryArtists": "正在更新資料庫的藝人...", + "notification.connectionError": "無法連接到 Apple Music。", // Terms "term.appleMusic": "Apple Music", // Follows brand term "term.applePodcasts": "Apple Podcasts", // Follows brand term @@ -64,6 +67,20 @@ "term.enabled": "已啟用", "term.disabled": "已停用", "term.connect": "連接", + "term.confirm": "確定？", + "term.more": "更多", + "term.less": "更少", + "term.showMore": "顯示更多", + "term.showLess": "顯示更少", + "term.topSongs" : "熱門歌曲", + "term.latestReleases": "最新發行", + "term.time.added": "加入于", + "term.time.released": "發行于", + "term.time.updated": "更改于", + "term.fullscreenView": "全螢幕顯示", + "term.defaultView": "預設顯示", + "term.spacializedAudioSetting": "音訊空間化設定", + "term.clearAll": "清空", // Home "home.title": "主頁", @@ -165,7 +182,7 @@ // Settings - Experimental "settings.header.experimental": "實驗性功能", - "settings.header.experimental.description": "調整Cider的實驗性功能", + "settings.header.experimental.description": "調整 Cider 的實驗性功能", "settings.option.experimental.compactUI": "緊凑型UI", // Toggle // Refer to term.disabled & term.enabled diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs index ed557295..3fa55806 100644 --- a/src/renderer/views/components/queue.ejs +++ b/src/renderer/views/components/queue.ejs @@ -33,7 +33,7 @@
- +
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 300467c3..9203a773 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -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="{app.getLz('term.search')}" v-model="search.term" ref="searchInput" class="search-input"> @@ -247,7 +247,7 @@ diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 997fbf93..b326b8ce 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -48,7 +48,7 @@
@@ -57,7 +57,7 @@
-
From 5478fbf34838344df42fba3364476b40dcfea324 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Tue, 25 Jan 2022 09:57:14 +0700 Subject: [PATCH 5/7] fixed --- src/renderer/views/main.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 9203a773..a22a93f8 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -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="{app.getLz('term.search')}" v-model="search.term" + @input="getSearchHints()" :placeholder="app.getLz('term.search') + ' ...'" v-model="search.term" ref="searchInput" class="search-input"> From b7c068b5134269ff2578bfd8fc9cfe3e1b4023c4 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Tue, 25 Jan 2022 10:02:39 +0700 Subject: [PATCH 6/7] why --- src/renderer/views/main.ejs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index a22a93f8..20317417 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -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="app.getLz('term.search') + ' ...'" v-model="search.term" + @input="getSearchHints()" :placeholder="$root.getLz('term.search') + ' ...'" v-model="search.term" ref="searchInput" class="search-input"> @@ -247,7 +247,7 @@ From 518a5f59b25286c18e6768c08df09c8735e61bb0 Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Tue, 25 Jan 2022 13:44:35 +0800 Subject: [PATCH 7/7] Resize queue-col --- src/renderer/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/style.less b/src/renderer/style.less index e167fd0f..27119f5b 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -4575,7 +4575,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { .queue-col { width: 60vh; - height: 50vh; + height: 62vh; .queue-title { opacity: 0.6;