diff --git a/Assets/Cider with text.svg b/Assets/Cider with text.svg new file mode 100644 index 00000000..81052080 --- /dev/null +++ b/Assets/Cider with text.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + Cider + + + diff --git a/Assets/Release.svg b/Assets/Release.svg new file mode 100644 index 00000000..f27dc45d --- /dev/null +++ b/Assets/Release.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/renderer/assets_sources/Cider.afdesign b/Assets/Sources/Cider with text.afdesign similarity index 100% rename from src/renderer/assets_sources/Cider.afdesign rename to Assets/Sources/Cider with text.afdesign diff --git a/Assets/Sources/Release.afdesign b/Assets/Sources/Release.afdesign new file mode 100644 index 00000000..b6484806 Binary files /dev/null and b/Assets/Sources/Release.afdesign differ diff --git a/Assets/Sources/cider-vinyl no raster.afdesign b/Assets/Sources/cider-vinyl no raster.afdesign new file mode 100644 index 00000000..64d895bd Binary files /dev/null and b/Assets/Sources/cider-vinyl no raster.afdesign differ diff --git a/Assets/Sources/cider-vinyl.afdesign b/Assets/Sources/cider-vinyl.afdesign new file mode 100644 index 00000000..ba1f0da0 Binary files /dev/null and b/Assets/Sources/cider-vinyl.afdesign differ diff --git a/Assets/Vinyl Logo/cider-vinyl no raster.svg b/Assets/Vinyl Logo/cider-vinyl no raster.svg new file mode 100644 index 00000000..5077ad35 --- /dev/null +++ b/Assets/Vinyl Logo/cider-vinyl no raster.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Vinyl Logo/cider-vinyl textured.svg b/Assets/Vinyl Logo/cider-vinyl textured.svg new file mode 100644 index 00000000..f115c926 --- /dev/null +++ b/Assets/Vinyl Logo/cider-vinyl textured.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/assets_sources/logotmp.afdesign b/src/renderer/assets_sources/logotmp.afdesign deleted file mode 100644 index 4d426338..00000000 Binary files a/src/renderer/assets_sources/logotmp.afdesign and /dev/null differ diff --git a/src/renderer/style.less b/src/renderer/style.less index 81dba007..0a280a01 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3084,6 +3084,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; 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..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="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 @@ diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs index 0f6d1679..07300f6f 100644 --- a/src/renderer/views/pages/artist.ejs +++ b/src/renderer/views/pages/artist.ejs @@ -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 ?? '')"> -
+
@@ -30,7 +30,7 @@

{{ data.attributes.name }}

-
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 @@
-