Merge branch 'develop' into develop

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 github: ciderapp
 ko_fi: cryptofyre
 open_collective: ciderapp
+custom: "https://opencollective.com/ciderapp/donate/10/month/Support%20Development?redirect=https://cidercollective.dev/thanks"

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -33,12 +33,12 @@ body:
       description: |
         Examples:
           - **OS**: Ubuntu 20.04
-          - **App Version**: 1.0.0
+          - **App Version** and/or **Commit ID**: 1.0.0 c9d43be
-          - **Commit ID**: c9d43be
+        
+        To find app version, go to the About page.
       value: |
         - OS:
-        - App Version:
+        - App Version and/or Commit ID:
-        - Commit ID:
     validations:
       required: true
   - type: textarea

README.md

@@ -1,5 +1,7 @@
 <p align="center">
-  <img src="./resources/banner.png" width="80%" height="60%" alt="Banner"><br><br>
+  <img src="./resources/banner.png" width="80%" height="60%" alt="Banner"><br>
+  <b>A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind. 🚀</b>
+  <br><br>
   <img src="https://img.shields.io/github/stars/ciderapp/Cider?label=Stars" alt="GitHub Stars"/>
   <img src="https://img.shields.io/github/forks/ciderapp/Cider?label=Forks" alt="GitHub Forks"/>
   <a title="Crowdin" target="_blank" href="https://crowdin.com/project/cider-music"><img src="https://badges.crowdin.net/cider-music/localized.svg"></a>
@@ -16,7 +18,7 @@
 </p>
 
 #### Links
-* [Wiki](https://github.com/ciderapp/Cider/wiki)
+* [Wiki](https://docs.cider.sh)
 * [Request Feature](https://github.com/ciderapp/Cider/discussions/new?category=feature-request)
 * [Report Bug](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+)
 * [**View The Releases**](https://github.com/ciderapp/Cider/releases/latest)
@@ -26,10 +28,12 @@
 
 [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66)
 
-[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Stable)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider)
-
 [![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly)
 
+<!--
+[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly)
+-->
+
 [![Get it from Flathub](https://img.shields.io/badge/Get_It_From_Flathub-100000?style=for-the-badge&logo=flathub)](https://flathub.org/apps/details/sh.cider.Cider)
 
 <!--
@@ -40,7 +44,6 @@
 -->
 [![Get it from the AUR](https://img.shields.io/badge/Get_It_From_The_AUR-100000?style=for-the-badge&logo=archlinux)](https://aur.archlinux.org/packages/cider)
 
-
 ### Compiling and Configuration
 For more information surrounding configuration, compiling and other developer documentation, see the [compilation docs](https://cider.sh/compile.html).
 

package.json

@@ -76,7 +76,7 @@
     "@types/express": "^4.17.13",
     "@types/qrcode-terminal": "^0.12.0",
     "@types/ws": "^8.5.3",
-    "electron": "git+https://github.com/castlabs/electron-releases.git",
+    "electron": "git+https://github.com/castlabs/electron-releases.git#18-x-y",
     "electron-builder": "^23.0.3",
     "electron-builder-notarize-pkg": "^1.2.0",
     "electron-webpack": "^2.8.2",

src/i18n/README.md

@@ -267,6 +267,10 @@ Update 22/04/2022 13:00 UTC
 * `settings.option.general.keybindings`: Added for `en_US`
 * `settings.option.general.keybindings.open`: Added for `en_US`
 
+Update 22/04/2022 16:00 UTC
+
+* `settings.option.visual.theme.github.openfolder`: Added for `en_US`
+
 Update 25/04/2022 00:21 UTC
 
 *  `settings.description.search`: Added for `en_US`

src/i18n/en_US.json

@@ -374,6 +374,7 @@
   "settings.option.visual.uiscale": "UI Scale",
   "settings.header.visual.theme": "Theme",
   "settings.option.visual.theme.github.download": "Install from GitHub URL",
+  "settings.option.visual.theme.github.openfolder": "Open Themes Folder",
   "settings.option.visual.theme.github.explore": "Explore GitHub Themes",
   "settings.header.visual.theme.github.page": "Themes from GitHub",
   "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?",

src/i18n/hu_HU.json

@@ -355,6 +355,7 @@
   "settings.option.visual.uiscale": "Nagyítás mértéke",
   "settings.header.visual.theme": "Téma",
   "settings.option.visual.theme.github.download": "Telepítés GitHub URL-ről",
+  "settings.button.visual.theme.github.openfolder": "Témamappa megnyitása",
   "settings.option.visual.theme.github.explore": "Témák felfedezése",
   "settings.header.visual.theme.github.page": "Témák a GitHub-ról",
   "settings.option.visual.theme.github.install.confirm": "Biztosan szeretnéd telepíteni a(z) {{ repo }} témát?",

src/i18n/source/en_US.json

@@ -374,6 +374,7 @@
   "settings.option.visual.uiscale": "UI Scale",
   "settings.header.visual.theme": "Theme",
   "settings.option.visual.theme.github.download": "Install from GitHub URL",
+  "settings.option.visual.theme.github.openfolder": "Open Themes Folder",
   "settings.option.visual.theme.github.explore": "Explore GitHub Themes",
   "settings.header.visual.theme.github.page": "Themes from GitHub",
   "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?",

src/main/plugins/menubar.ts

@@ -112,7 +112,7 @@ export default class Thumbar {
                     label: 'Web Remote',
                     accelerator: 'CommandOrControl+Shift+W',
                     sublabel: 'Opens in external window',
-                    click: () => this._win.webContents.executeJavaScript(`ipcRenderer.invoke('showQR')`)
+                    click: () => this._win.webContents.executeJavaScript(`app.appRoute('remote-pair')`)
                 },
                 {
                     label: 'Audio Settings',

src/main/plugins/raop.ts

@@ -88,13 +88,14 @@ export default class RAOP {
 
 `;
 
-    private ondeviceup(name: any, host: any, port: any, addresses: any) {
+    private ondeviceup(name: any, host: any, port: any, addresses: any, text: any) {
         if (this.castDevices.findIndex((item: any) => item.name === host && item.port === port && item.addresses === addresses) === -1) {
             this.castDevices.push({
                 name: host,
                 host: addresses ? addresses[0] : '',
                 port: port,
-                addresses: addresses
+                addresses: addresses,
+                txt: text
             });
             if (this.devices.indexOf(host) === -1) {
                 this.devices.push(host);
@@ -146,10 +147,11 @@ export default class RAOP {
 
             browser.on('update', (service: any) => {
                 if (service.addresses && service.fullname && service.fullname.includes('_raop._tcp')) {
+                    console.log(service.txt)
                 this._win.webContents.executeJavaScript(`console.log(
                     "${service.name} ${service.host}:${service.port} ${service.addresses}"
-                )`);}
+                )`);
-                this.ondeviceup(service.name, service.host, service.port, service.addresses);
+                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);}
             });
 
         });

src/renderer/views/pages/cider-playlist.ejs

@@ -9,11 +9,7 @@
         </template>
         <template v-if="app.playlists.loadingState == 1">
             <div class="playlist-display"
-                 @mouseover.self="minClass(false)"
+                 @mouseover.self="minClass(false)">
-                 :style="{
-                '--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : '',
-                '--textColor': (data.attributes.artwork != null && data.attributes.artwork['textColor1'] != null) ? ('#' + data.attributes.artwork.textColor1) : ''
-            }">
                 <div class="playlistInfo">
                     <div class="row">
                         <div class="col-auto flex-center" @mouseover="minClass(false)">

src/renderer/views/pages/themes-github.ejs

@@ -15,7 +15,7 @@
                 </div>
                 <div class="col-auto flex-center">
                     <button class="md-btn md-btn-small md-btn-block" @click="openThemesFolder()">
-                        Open Themes Folder
+                        {{$root.getLz('settings.option.visual.theme.github.openfolder')}}
                     </button>
                 </div>
                 <div class="col-auto nopadding flex-center">