Merge remote-tracking branch 'upstream/upcoming' into upcoming

package.json

@@ -134,6 +134,13 @@
       "publisherDisplayName": "Cider Collective",
       "backgroundColor": "transparent",
       "setBuildNumber": true
+    },
+		"nsis": {
+      "oneClick": false,
+      "perMachine": false,
+      "allowToChangeInstallationDirectory": true,
+			"license": "LICENSE",
+			"deleteAppDataOnUninstall": true
     },
     "win": {
       "target": [

src/i18n/el_GR.jsonc

@@ -0,0 +1,95 @@
+{
+  // App info
+  "app.name": "Cider",
+  // Dialogs
+  "dialog.cancel": "Ακύρωση",
+  "dialog.ok": "ΟΚ",
+  // Terms
+  "term.appleMusic": "Apple Music",
+  "term.applePodcasts": "Apple Podcasts",
+  "term.itunes": "iTunes",
+  "term.github": "GitHub",
+  "term.discord": "Discord",
+  "term.learnMore": "Μάθετε Περισσότερα",
+  "term.accountSettings": "Ρυθμίσεις Λογαριασμού",
+  "term.logout": "Αποσύνδεση",
+  "term.login": "Σύνδεση",
+  "term.about": "Σχετικά με",
+  "term.privateSession": "Ιδιωτική Περίοδος Λειτουργίας",
+  "term.queue": "Ουρά",
+  "term.search": "Εύρεση",
+  "term.library": "Βιβλιοθήκη",
+  "term.recentlyAdded": "Πρόσφατες Προσθήκες",
+  "term.songs": "Τραγούδια",
+  "term.albums": "Άλμπουμ",
+  "term.artists": "Καλλιτέχνες",
+  "term.podcasts": "Podcast",
+  "term.playlists": "Λίστες Αναπαραγωγής",
+  "term.playlist": "Λίστα Αναπαραγωγής",
+  "term.play": "Αναπαραγωγή",
+  "term.pause": "Παύση",
+  "term.previous": "Προηγούμενο",
+  "term.next": "Επόμενο",
+  "term.shuffle": "Τυχαία Σειρά",
+  "term.repeat": "Επανάληψη",
+  "term.volume": "Ένταση",
+  "term.mute": "Σίγαση",
+  "term.unmute": "Κατάργηση Σίγασης",
+  "term.share": "Κοινή Χρήση",
+  "term.settings": "Ρυθμίσεις",
+  "term.seeAll": "Προβολή Όλων",
+  // Home
+  "home.title": "Αρχική",
+  "home.recentlyPlayed": "Έπαιξαν Πρόσφατα",
+  "home.recentlyAdded": "Πρόσφατες Προσθήκες",
+  "home.artistsFeed": "Ροή των Καλλιτεχνών σου",
+  "home.madeForYou": "Δημιουργήθηκε Για Εσάς",
+  "home.friendsListeningTo": "Οι Φίλοι σου Ακούν",
+  "home.followedArtists": "Καλλιτέχνες που Ακολουθείτε",
+  // Errors
+  "error.appleMusicSubRequired": "Το Apple Music απαιτεί μια συνδρομή.",
+  // Actions
+  "action.addToLibrary": "Προσθήκη στη Βιβλιοθήκη",
+  "action.addToLibrary.success": "Προστέθηκε στη Βιβλιοθήκη",
+  "action.addToLibrary.error": "Σφάλμα Προσθήκης στη Βιβλιοθήκης",
+  "action.removeFromLibrary": "Αφαίρεση από τη Βιβλιοθήκη",
+  "action.removeFromLibrary.success": "Αφαιρέθηκε από τη Βιβλιοθήκη",
+  "action.addToQueue": "Προσθήκη στην Ουρά",
+  "action.addToQueue.success": "Προστέθηκε στην Ουρά",
+  "action.addToQueue.error": "Προστέθηκε στην Ουρά",
+  "action.removeFromQueue": "Αφαίρεση από την Ουρά",
+  "action.removeFromQueue.success": "Αφαιρέθηκε από την Ουρά",
+  "action.removeFromQueue.error": "Σφάλμα Αφαίρεσης από την Ουρά",
+  "action.follow": "Ακολούθηση",
+  "action.follow.success": "Ακολουθήθηκε",
+  "action.follow.error": "Σφάλμα Ακολούθησης",
+  "action.unfollow": "Διακοπή Ακολούθησης",
+  "action.unfollow.success": "Έγινε Διακοπή Ακολούθησης",
+  "action.unfollow.error": "Σφάλμα Διακοπής Ακολούθησης ",
+  "action.playNext": "Αναπαραγωγή ως Επόμενου",
+  "action.playLater": "Αναπαραγωγή Αργότερα",
+  "action.startRadio": "Έναρξη Σταθμού",
+  "action.goToArtist": "Μετάβαση σε Καλλιτέχνη",
+  "action.goToAlbum": "Μετάβαση σε Άλμπουμ",
+  "action.share": "Κοινή Χρήση",
+  "action.love": "Μου αρέσει πολύ",
+  "action.unlove": "Αναίρεση \"Μου Αρέσει\"",
+  "action.dislike": "Δεν μου αρέσει",
+  "action.undoDislike": "Αναίρεση \"Δεν μου αρέσει\"",
+  // Settings
+  "settings.header.audio": "Ήχος",
+  "settings.header.audio.description": "Προσαρμογή ρυθμίσεων ήχου για το Cider.",
+  "settings.header.audio.quality.high": "Υψηλή",
+  "settings.header.audio.quality.low": "Χαμηλή",
+  "settings.header.audio.quality.auto": "Αυτόματη",
+  "settings.header.visual": "Οπτικά",
+  "settings.header.visual.description": "Προσαρμογή οπτικών ρυθμίσεων για το Cider.",
+  "settings.header.general": "Γενικά",
+  "settings.header.general.description": "Προσαρμογή γενικών ρυθμίσεων για το Cider.",
+  "settings.header.lyrics": "Στίχοι",
+  "settings.header.lyrics.description": "Προσαρμογή ρυθμίσεων στίχων για το Cider.",
+  "settings.header.connectivity": "Σύνδεση",
+  "settings.header.connectivity.description": "Προσαρμογή ρυθμίσεων σύνδεσης για το Cider.",
+  "settings.header.experimental": "Πειραματικές",
+  "settings.header.experimental.description": "Προσαρμογή πειραματικών ρυθμίσεων για το Cider."
+}

src/i18n/ja_JP.jsonc

@@ -0,0 +1,95 @@
+{
+  // App info
+  "app.name": "Cider",
+  // Dialogs
+  "dialog.cancel": "キャンセル",
+  "dialog.ok": "OK",
+  // Terms
+  "term.appleMusic": "Apple Music", // Follows brand term
+  "term.applePodcasts": "Apple Podcasts", // Follows brand term
+  "term.itunes": "iTunes", // Follows brand term
+  "term.github": "GitHub", // Follows brand term
+  "term.discord": "Discord", // Follows brand term
+  "term.learnMore": "詳しい情報",
+  "term.accountSettings": "アカウント設定",
+  "term.logout": "サインアウト",
+  "term.login": "サインイン",
+  "term.about": "アプリについて",
+  "term.privateSession": "プライベートセッション",
+  "term.queue": "次はこちら",
+  "term.search": "検索",
+  "term.library": "ライブラリ",
+  "term.recentlyAdded": "最近追加した項目",
+  "term.songs": "曲",
+  "term.albums": "アルバム",
+  "term.artists": "アーティスト",
+  "term.podcasts": "Podcast",
+  "term.playlists": "プレイリスト",
+  "term.playlist": "プレイリスト",
+  "term.play": "再生",
+  "term.pause": "停止",
+  "term.previous": "戻る",
+  "term.next": "次へ",
+  "term.shuffle": "シャッフル",
+  "term.repeat": "リピート",
+  "term.volume": "音量",
+  "term.mute": "ミュート",
+  "term.unmute": "ミュート解除",
+  "term.share": "共有",
+  "term.settings": "設定",
+  "term.seeAll": "全部表示",
+  // Home
+  "home.title": "ホーム",
+  "home.recentlyPlayed": "最近の再生",
+  "home.recentlyAdded": "最近追加した項目",
+  "home.artistsFeed": "アーティストのフィード",
+  "home.madeForYou": "あなたにおすすめ",
+  "home.friendsListeningTo": "友達が聴いている",
+  "home.followedArtists": "フォローしているアーティスト",
+  // Errors
+  "error.appleMusicSubRequired": "Apple Musicのサブスクリプションが必要です。",
+  // Actions
+  "action.addToLibrary": "ライブラリに追加",
+  "action.addToLibrary.success": "ライブラリに追加されました",
+  "action.addToLibrary.error": "ついか",
+  "action.removeFromLibrary": "ライブラリから削除",
+  "action.removeFromLibrary.success": "ライブラリから削除されました",
+  "action.addToQueue": "キューに追加",
+  "action.addToQueue.success": "キューに追加されました",
+  "action.addToQueue.error": "操作を完了できませんでした",
+  "action.removeFromQueue": "キューから削除",
+  "action.removeFromQueue.success": "キューから削除されました",
+  "action.removeFromQueue.error": "操作を完了できませんでした",
+  "action.follow": "フォロー",
+  "action.follow.success": "フォロー中",
+  "action.follow.error": "操作を完了できませんでした",
+  "action.unfollow": "フォロー解除",
+  "action.unfollow.success": "フォローをやめました",
+  "action.unfollow.error": "操作を完了できませんでした",
+  "action.playNext": "次に再生",
+  "action.playLater": "最後に再生",
+  "action.startRadio": "ステーションを作成",
+  "action.goToArtist": "アーティストへ移動",
+  "action.goToAlbum": "アルバムへ移動",
+  "action.share": "曲を共有",
+  "action.love": "ラブ",
+  "action.unlove": "ラブを解除",
+  "action.dislike": "これに似たものをすすめない",
+  "action.undoDislike": "「これと似た曲のおすすめを減らす」を取り消す",
+  // Settings
+  "settings.header.audio": "オーディオ",
+  "settings.header.audio.description": "Ciderのオーディオ設定",
+  "settings.header.audio.quality.high": "高品質",
+  "settings.header.audio.quality.low": "高効率",
+  "settings.header.audio.quality.auto": "自動",
+  "settings.header.visual": "ビジュアル",
+  "settings.header.visual.description": "Ciderのビジュアル設定",
+  "settings.header.general": "一般",
+  "settings.header.general.description": "Ciderの一般設定",
+  "settings.header.lyrics": "歌詞",
+  "settings.header.lyrics.description": "歌詞の表示設定",
+  "settings.header.connectivity": "アプリと連携",
+  "settings.header.connectivity.description": "Ciderの連携設定",
+  "settings.header.experimental": "試験的な機能",
+  "settings.header.experimental.description": "Ciderの試験的な機能",
+}

src/i18n/zh_CN.jsonc

@@ -0,0 +1,95 @@
+{
+  // App info
+  "app.name": "Cider",
+  // Dialogs
+  "dialog.cancel": "取消",
+  "dialog.ok": "确定",
+  // Terms
+  "term.appleMusic": "Apple Music", // Follows brand term
+  "term.applePodcasts": "Apple Podcasts", // Follows brand term
+  "term.itunes": "iTunes", // Follows brand term
+  "term.github": "GitHub", // Follows brand term
+  "term.discord": "Discord", // Follows brand term
+  "term.learnMore": "更多信息",
+  "term.accountSettings": "账户设置",
+  "term.logout": "登出",
+  "term.login": "登录",
+  "term.about": "关于",
+  "term.privateSession": "私人聆听",
+  "term.queue": "队列",
+  "term.search": "搜索",
+  "term.library": "音乐库",
+  "term.recentlyAdded": "最近添加",
+  "term.songs": "歌曲",
+  "term.albums": "专辑",
+  "term.artists": "歌手",
+  "term.podcasts": "播客",
+  "term.playlists": "播放列表",
+  "term.playlist": "播放列表",
+  "term.play": "播放",
+  "term.pause": "暂停",
+  "term.previous": "上一首",
+  "term.next": "下一首",
+  "term.shuffle": "随机播放",
+  "term.repeat": "重复播放",
+  "term.volume": "音量",
+  "term.mute": "静音",
+  "term.unmute": "解除静音",
+  "term.share": "分享",
+  "term.settings": "设置",
+  "term.seeAll": "查看全部",
+  // Home
+  "home.title": "主页",
+  "home.recentlyPlayed": "最近播放",
+  "home.recentlyAdded": "最近添加",
+  "home.artistsFeed": "您的歌手推荐",
+  "home.madeForYou": "为您量身定制",
+  "home.friendsListeningTo": "朋友正在听",
+  "home.followedArtists": "关注的歌手",
+  // Errors
+  "error.appleMusicSubRequired": "需要订阅Apple Music以使用Cider",
+  // Actions
+  "action.addToLibrary": "加入音乐库",
+  "action.addToLibrary.success": "成功加入音乐库",
+  "action.addToLibrary.error": "加入音乐库的过程发生了错误",
+  "action.removeFromLibrary": "从音乐库中移除",
+  "action.removeFromLibrary.success": "已从音乐库中移除",
+  "action.addToQueue": "加入队列",
+  "action.addToQueue.success": "成功加入队列",
+  "action.addToQueue.error": "加入队列的过程发生了错误",
+  "action.removeFromQueue": "从队列中移除",
+  "action.removeFromQueue.success": "已从队列中移除",
+  "action.removeFromQueue.error": "从队列中移除的过程发生了错误",
+  "action.follow": "关注",
+  "action.follow.success": "已关注",
+  "action.follow.error": "尝试关注的过程发生了错误",
+  "action.unfollow": "取消关注",
+  "action.unfollow.success": "已取消关注",
+  "action.unfollow.error": "尝试取消关注的过程发生了错误",
+  "action.playNext": "下一首播放",
+  "action.playLater": "最后播放",
+  "action.startRadio": "开始电台",
+  "action.goToArtist": "前往歌手",
+  "action.goToAlbum": "前往专辑",
+  "action.share": "分享歌曲",
+  "action.love": "喜欢",
+  "action.unlove": "取消喜欢",
+  "action.dislike": "减少此类建议",
+  "action.undoDislike": "撤销减少此类建议",
+  // Settings
+  "settings.header.audio": "音频",
+  "settings.header.audio.description": "调整Cider的音质",
+  "settings.header.audio.quality.high": "高音质",
+  "settings.header.audio.quality.low": "高效率",
+  "settings.header.audio.quality.auto": "自动",
+  "settings.header.visual": "外观",
+  "settings.header.visual.description": "调整Cider的外观",
+  "settings.header.general": "通用",
+  "settings.header.general.description": "调整Cider的通用设置",
+  "settings.header.lyrics": "歌词",
+  "settings.header.lyrics.description": "调整Cider的歌词设置",
+  "settings.header.connectivity": "外部连接",
+  "settings.header.connectivity.description": "调整Cider与外部的连接",
+  "settings.header.experimental": "实验性功能",
+  "settings.header.experimental.description": "调整Cider的实验性功能",
+}

src/i18n/zh_TW.jsonc

@@ -0,0 +1,95 @@
+{
+  // App info
+  "app.name": "Cider",
+  // Dialogs
+  "dialog.cancel": "取消",
+  "dialog.ok": "OK",
+  // Terms
+  "term.appleMusic": "Apple Music", // Follows brand term
+  "term.applePodcasts": "Apple Podcasts", // Follows brand term
+  "term.itunes": "iTunes", // Follows brand term
+  "term.github": "GitHub", // Follows brand term
+  "term.discord": "Discord", // Follows brand term
+  "term.learnMore": "更多内容",
+  "term.accountSettings": "賬戶設定",
+  "term.logout": "登出",
+  "term.login": "登入",
+  "term.about": "關於",
+  "term.privateSession": "私人時段",
+  "term.queue": "待播清單",
+  "term.search": "搜尋",
+  "term.library": "資料庫",
+  "term.recentlyAdded": "最近加入",
+  "term.songs": "歌曲",
+  "term.albums": "專輯",
+  "term.artists": "藝人",
+  "term.podcasts": "Podcasts",
+  "term.playlists": "播放列表",
+  "term.playlist": "播放列表",
+  "term.play": "播放",
+  "term.pause": "暫停",
+  "term.previous": "上一首",
+  "term.next": "下一首",
+  "term.shuffle": "隨機播放",
+  "term.repeat": "重複播放",
+  "term.volume": "音量",
+  "term.mute": "靜音",
+  "term.unmute": "取消靜音",
+  "term.share": "分享",
+  "term.settings": "設定",
+  "term.seeAll": "顯示全部",
+  // Home
+  "home.title": "主頁",
+  "home.recentlyPlayed": "最近播放",
+  "home.recentlyAdded": "最近加入",
+  "home.artistsFeed": "藝人追蹤",
+  "home.madeForYou": "為您推薦",
+  "home.friendsListeningTo": "朋友正在聆聽",
+  "home.followedArtists": "追蹤的藝人",
+  // Errors
+  "error.appleMusicSubRequired": "需要訂閱Apple Music以使用Cider",
+  // Actions
+  "action.addToLibrary": "加入資料庫",
+  "action.addToLibrary.success": "成功加入資料庫",
+  "action.addToLibrary.error": "加入資料庫的過程發生錯誤",
+  "action.removeFromLibrary": "從資料庫刪除",
+  "action.removeFromLibrary.success": "已從資料庫刪除",
+  "action.addToQueue": "加入待播清單",
+  "action.addToQueue.success": "成功加入待播清單",
+  "action.addToQueue.error": "加入待播清單的過程發生錯誤",
+  "action.removeFromQueue": "從代播清單刪除",
+  "action.removeFromQueue.success": "已從代播清單刪除",
+  "action.removeFromQueue.error": "從代播清單刪除的過程發生錯誤",
+  "action.follow": "追蹤",
+  "action.follow.success": "追蹤中",
+  "action.follow.error": "追蹤的過程發生錯誤",
+  "action.unfollow": "取消追蹤",
+  "action.unfollow.success": "已取消追蹤",
+  "action.unfollow.error": "取消追蹤的過程發生錯誤",
+  "action.playNext": "插播",
+  "action.playLater": "最後播放",
+  "action.startRadio": "建立電台",
+  "action.goToArtist": "前往藝人",
+  "action.goToAlbum": "前往專輯",
+  "action.share": "分享歌曲",
+  "action.love": "喜愛",
+  "action.unlove": "取消喜愛",
+  "action.dislike": "減少此類建議",
+  "action.undoDislike": "還原減小此類建議",
+  // Settings
+  "settings.header.audio": "音訊",
+  "settings.header.audio.description": "調整Cider的音訊設定",
+  "settings.header.audio.quality.high": "高品質",
+  "settings.header.audio.quality.low": "高效率",
+  "settings.header.audio.quality.auto": "自動",
+  "settings.header.visual": "外觀",
+  "settings.header.visual.description": "調整Cider的外觀",
+  "settings.header.general": "一般",
+  "settings.header.general.description": "調整Cider的一般設定",
+  "settings.header.lyrics": "歌詞",
+  "settings.header.lyrics.description": "調整Cider的歌詞設定",
+  "settings.header.connectivity": "外部連接",
+  "settings.header.connectivity.description": "調整Cider與外部的連接",
+  "settings.header.experimental": "實驗性功能",
+  "settings.header.experimental.description": "調整Cider的實驗性功能",
+}

src/renderer/index.js

@@ -3293,7 +3293,7 @@ const app = new Vue({
                 this.tmpWidth = window.innerWidth;
                 this.tmpHeight = window.innerHeight;
                 ipcRenderer.send('setFullScreen', false);
-                ipcRenderer.send('windowresize', 250, 250, false)
+                ipcRenderer.send('windowresize', 364, 364, false)
                 app.appMode = 'mini';
             } else {
                 ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false)

src/renderer/style.less

@@ -4763,7 +4763,6 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
 .mini-view {
   width: 100%;
   height: 100%;
-  background: black;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -5014,7 +5013,8 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
     .controls-parents {
       width: 100%;
       position: absolute;
-      background: black;
+      background: #0000009e;
+      backdrop-filter: blur(10px);
       bottom: 0px;
       z-index: 3;
       opacity: 0;

src/renderer/views/components/miniplayer.ejs

@@ -3,7 +3,7 @@
         <div class="background">
         </div>  
         <div class="player-exit" title="Close" @click="app.miniPlayer(false)">
-            <svg fill="white" xmlns="http://www.w3.org/2000/svg" width="21" height="21" viewBox="0 0 21 21"
+            <svg fill="#323232e3" xmlns="http://www.w3.org/2000/svg" width="21" height="21" viewBox="0 0 21 21"
                  aria-role="presentation" focusable="false">
                 <path
                         d="M10.5 21C4.724 21 0 16.275 0 10.5S4.724 0 10.5 0 21 4.725 21 10.5 16.276 21 10.5 21zm-3.543-5.967a.96.96 0 00.693-.295l2.837-2.842 2.85 2.842c.167.167.41.295.693.295.552 0 1.001-.461 1.001-1.012 0-.281-.115-.512-.295-.704L11.899 10.5l2.85-2.855a.875.875 0 00.295-.68c0-.55-.45-.998-1.001-.998a.871.871 0 00-.668.295l-2.888 2.855-2.862-2.843a.891.891 0 00-.668-.281.99.99 0 00-1.001.986c0 .269.116.512.295.678L9.088 10.5l-2.837 2.843a.926.926 0 00-.295.678c0 .551.45 1.012 1.001 1.012z"
@@ -26,7 +26,7 @@
                             {{ app.mk.nowPlayingItem["attributes"]["name"] }}
                         </div>
                         <div
-                             style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden;">
+                             style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden; margin-bottom: 5px;">
                             <div class="item-navigate song-artist" style="display: inline-block;"
                                  @click="app.getNowPlayingItemDetailed(`artist`)">
                                 {{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
@@ -39,7 +39,7 @@
                         </div>
 
                         <div class="song-progress">
-                            <div class="song-duration" style="justify-content: space-between; height: 1px;"
+                            <div class="song-duration" style="justify-content: space-between; height: 1px; margin-bottom: 1px;"
                                  :style="[app.chrome.progresshover ? {'display': 'flex'} : {'display' : 'none'} ]">
                                 <p style="width: auto">{{ app.convertToMins(app.getSongProgress()) }}</p>
                                 <p style="width: auto">{{ app.convertToMins(app.mk.currentPlaybackDuration) }}</p>