Merge branch 'dev' into libjsoncpp26-support

.env.example

@@ -1,7 +1,3 @@
-# The format:
-# SPOTIFY_SECRETS=clintId1:clientSecret1,clientId2:clientSecret2
-SPOTIFY_SECRETS=$SPOTIFY_SECRETS
-
 # 0 or 1
 # 0 = disable
 # 1 = enable
@@ -14,4 +10,3 @@ LASTFM_API_SECRET=$LASTFM_API_SECRET
 RELEASE_CHANNEL=$RELEASE_CHANNEL
 
 HIDE_DONATIONS=$HIDE_DONATIONS
-DISABLE_SPOTIFY_IMAGES=$DISABLE_SPOTIFY_IMAGES

.fvm/fvm_config.json

@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.29.2"
+  "flutterSdkVersion": "3.35.2"
 }

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.29.2",
+  "flutter": "3.35.2",
   "flavors": {}
 }

.github/workflows/pr-lint.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  FLUTTER_VERSION: 3.29.2
+  FLUTTER_VERSION: 3.35.2
 
 jobs:
   lint:
@@ -21,7 +21,6 @@ jobs:
         run: |
           envsubst < .env.example > .env
         env:
-          SPOTIFY_SECRETS: xxx:xxx
           ENABLE_UPDATE_CHECK: true
           LASTFM_API_KEY: xxx
           LASTFM_API_SECRET: xxx

.github/workflows/spotube-release-binary.yml

@@ -20,7 +20,7 @@ on:
         description: Dry run without uploading to release
 
 env:
-  FLUTTER_VERSION: 3.29.2
+  FLUTTER_VERSION: 3.35.2
   FLUTTER_CHANNEL: master
 
 permissions:
@@ -56,7 +56,7 @@ jobs:
             files: |
               dist/Spotube-windows-x86_64.nupkg
               dist/Spotube-windows-x86_64-setup.exe
-          - os: macos-latest
+          - os: macos-14
             platform: ios
             arch: all
             files: |
@@ -95,7 +95,7 @@ jobs:
         if: ${{matrix.platform == 'ios'}}
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "16.1"
+          xcode-version: "16.2"
 
       - name: Install ${{matrix.platform}} dependencies
         run: |

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "300451adae589accbece3490f4396f10bdf15e6e"
+  revision: "d7b523b356d15fb81e7d340bbe52b47f93937323"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
     - platform: windows
-      create_revision: 300451adae589accbece3490f4396f10bdf15e6e
-      base_revision: 300451adae589accbece3490f4396f10bdf15e6e
+      create_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
+      base_revision: d7b523b356d15fb81e7d340bbe52b47f93937323
 
   # User provided section
 

.vscode/launch.json

@@ -17,6 +17,17 @@
         "dev"
       ]
     },
+    {
+      "name": "spotube (mobile-skia)",
+      "type": "dart",
+      "request": "launch",
+      "program": "lib/main.dart",
+      "args": [
+        "--flavor",
+        "dev",
+        "--no-enable-impeller"
+      ]
+    },
     {
       "name": "spotube (profile)",
       "type": "dart",

.vscode/settings.json

@@ -5,10 +5,12 @@
     "ambiguate",
     "Amoled",
     "Buildless",
+    "configurators",
     "danceability",
     "fuzzywuzzy",
     "gapless",
     "instrumentalness",
+    "isrc",
     "Mpris",
     "RGBO",
     "riverpod",
@@ -28,5 +30,5 @@
     "README.md": "LICENSE,CODE_OF_CONDUCT.md,CONTRIBUTING.md,SECURITY.md,CONTRIBUTION.md,CHANGELOG.md,PRIVACY_POLICY.md",
     "*.dart": "${capture}.g.dart,${capture}.freezed.dart"
   },
-  "dart.flutterSdkPath": ".fvm/versions/3.29.2"
+  "dart.flutterSdkPath": ".fvm/versions/3.35.2"
 }

Makefile

@@ -8,7 +8,7 @@ tar:
 		mkdir -p $(TEMP_DIR)\
 		&& cp -r $(BUNDLE_DIR)/* $(TEMP_DIR)\
 		&& cp linux/spotube.desktop $(TEMP_DIR)\
-		&& cp assets/spotube-logo.png $(TEMP_DIR)\
+		&& cp assets/branding/spotube-logo.png $(TEMP_DIR)\
 		&& cp linux/com.github.KRTirtho.Spotube.appdata.xml $(TEMP_DIR)\
 		&& tar -cJf build/spotube-linux-${VERSION}-${PKG_ARCH}.tar.xz -C $(TEMP_DIR) .\
 		&& rm -rf $(TEMP_DIR)
@@ -53,3 +53,6 @@ dmg:
 		then rm dist/Spotube-macos-universal.dmg;\
 		fi &&\
 		appdmg appdmg.json dist/Spotube-macos-universal.dmg
+
+changelog:
+	git-cliff --unreleased

README.md

@@ -1,9 +1,8 @@
 <div align="center">
-  <img width="600" src="assets/spotube_banner.png" alt="Spotube Logo">
+  <img width="600" src="assets/branding/spotube_banner.png" alt="Spotube Logo">
 
-An open source, cross-platform Spotify client compatible across multiple platforms<br />
-utilizing Spotify's data API and YouTube, Piped.video or JioSaavn as an audio source,<br />
-eliminating the need for Spotify Premium
+A cross-platform extensible open-source music streaming platform.<br>
+Bring your own music metadata/playlist with plugins created by community or by yourself. A small step towards the decentralized music streaming era!
 
 Btw it's not just another Electron app 😉
 
@@ -19,31 +18,20 @@ Btw it's not just another Electron app 😉
 
 ---
 
-![Spotube Desktop](assets/spotube-screenshot.png)
-
-![Spotube Mobile](assets/mobile-screenshots/combined.png)
-
 </div>
 
 ## 🌃 Features
 
-- 🚫 No ads, thanks to the use of public & free Spotify and YT Music APIs¹
-- ⬇️ Freely downloadable tracks
-- 🖥️ 📱 Cross-platform support
-- 🪶 Small size & less data usage
-- 🕵️ Anonymous/guest login
-- 🕒 Time synced lyrics
-- ✋ No telemetry, diagnostics or user data collection
-- 🚀 Native performance
-- 📖 Open source/libre software
-- 🔉 Playback control is done locally, not on the server
-
-**¹** It is still **recommended** to support creators by engaging with their YouTube channels/Spotify tracks (or preferably by buying their merch/concert tickets/physical media).
-
-### ❌ Unsupported features
-
-- 🗣️ **Spotify Shows & Podcasts:** Shows and Podcasts will <ins>**never be supported**</ins> because the audio tracks are <ins>_only_</ins> available on Spotify and accessing them would require Spotify Premium.
-- 🎧 **Spotify Listen Along:** [Coming soon!](https://github.com/KRTirtho/spotube/issues/8)
+- 🧩 Plugin powered, supports any platform or custom music service through plugins.
+- 🗺️ Community driven plugins for popular platforms or create your own.
+- ⬇️ Freely downloadable tracks with tagged metadata.
+- 🖥️ 📱 Cross-platform support.
+- 🪶 Small size & less data usage.
+- 🕒 Time synced lyrics regardless of the plugin support.
+- ✋ No telemetry, diagnostics or user data collection.
+- 🚀 Native performance.
+- 📖 Open source/libre software.
+- 🔉 Playback control is done locally, not on the server.
 
 ## 📜 ⬇️ Installation guide
 
@@ -66,7 +54,7 @@ This handy table lists all the methods you can use to install Spotube:
     <td>MacOS</td>
     <td>
       <a href="https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-macos-universal.dmg">
-        <img width="220" alt="MacOS Download" src="https://reachify.io/wp-content/uploads/2018/09/mac-download-button-1.png">
+        <img width="220" alt="MacOS Download" src="https://memory-map.com/wp-content/uploads/download-mac-OS-01.svg">
       </a>
     </td>
   </tr>
@@ -189,9 +177,7 @@ You can compile Spotube's source code by [following these instructions](CONTRIBU
 ## 👥 The Spotube team
 
 - [Kingkor Roy Tirtho](https://github.com/KRTirtho) - The Founder, Maintainer and Lead Developer
-- [RaptaG](https://github.com/RaptaG) - The GitHub Moderator and Community Manager
 - [Owen Connor](https://github.com/owencz1998) - The Cool Discord Moderator
-- [Meenbeese](https://github.com/meenbeese) - The Android Developer
 - [Piotr Rogowski](https://github.com/karniv00l) - The MacOS Developer
 - [Rusty Apple](https://github.com/RustyApple) - The Mysterious Unknown Guy
 
@@ -199,7 +185,7 @@ You can compile Spotube's source code by [following these instructions](CONTRIBU
 
 Spotube is open source and licensed under the [BSD-4-Clause](/LICENSE) License.
 
-If you are concerned, you can [read the reason of choosing this license](https://dev.to/krtirtho/choosing-open-source-license-wisely-1m3p).
+If you are curious, you can [read the reason of choosing this license](https://dev.to/krtirtho/choosing-open-source-license-wisely-1m3p).
 
 <details>
   <summary>
@@ -210,15 +196,14 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 
 1. [Flutter](https://flutter.dev) - Flutter transforms the app development process. Build, test, and deploy beautiful mobile, web, desktop, and embedded apps from a single codebase
 1. [MPV](https://mpv.io) - mpv is a free (as in freedom) media player for the command line. It supports a wide variety of media file formats, audio and video codecs, and subtitle types.
-1. [Spotify API](https://developer.spotify.com/documentation/web-api) - The Spotify Web API is a RESTful API that provides access to Spotify data
+1. [Musicbrainz](https://musicbrainz.org) - MusicBrainz is a MetaBrainz project that aims to create a collaborative music database that is similar to the freedb project.
+1. [Listenbrainz](https://listenbrainz.org) - ListenBrainz is a open-source project by the MetaBrainz Foundation that allows users to crowdsource and publicly store their digital music listening data.
 1. [Piped](https://piped-docs.kavin.rocks/) - Piped is a privacy friendly alternative YouTube frontend, which is efficient and scalable by design.
 1. [Invidious](https://invidious.io/) - Invidious is an open source alternative front-end to YouTube.
-1. [YouTube](https://youtube.com/) - YouTube is an American online video-sharing platform headquartered in San Bruno, California. Three former PayPal employees—Chad Hurley, Steve Chen, and Jawed Karim—created the service in February 2005
-   1. [yt-dlp](https://github.com/yt-dlp/yt-dlp) - A feature-rich command-line audio/video downloader
-   1. [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor) - NewPipe's core library for extracting data from streaming sites
-1. [JioSaavn](https://www.jiosaavn.com) - JioSaavn is an Indian online music streaming service and a digital distributor of Bollywood, English and other regional Indian music across the world. Since it was founded in 2007 as Saavn, the company has acquired rights to over 5 crore (50 million) music tracks in 15 languages
+1. [yt-dlp](https://github.com/yt-dlp/yt-dlp) - A feature-rich command-line audio/video downloader.
+1. [NewPipeExtractor](https://github.com/TeamNewPipe/NewPipeExtractor) - NewPipe's core library for extracting data from streaming sites.
 1. [SongLink](https://song.link) - SongLink is a free smart link service that helps you share music with your audience. It's a one-stop-shop for creating smart links for music, podcasts, and other audio content
-1. [LRCLib](https://lrclib.net/) - A public synced lyric API
+1. [LRCLib](https://lrclib.net/) - A public synced lyric API.
 1. [Linux](https://www.linux.org) - Linux is a family of open-source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991, by Linus Torvalds. Linux is typically packaged in a Linux distribution
 1. [AUR](https://aur.archlinux.org) - AUR stands for Arch User Repository. It is a community-driven repository for Arch-based Linux distributions users
 1. [Flatpak](https://flatpak.org) - Flatpak is a utility for software deployment and package management for Linux
@@ -304,7 +289,6 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 1. [sliding_up_panel](https://github.com/akshathjain/sliding_up_panel) - A draggable Flutter widget that makes implementing a SlidingUpPanel much easier!
 1. [sliver_tools](https://github.com/Kavantix) - A set of useful sliver tools that are missing from the flutter framework
 1. [smtc_windows](https://pub.dev/packages/smtc_windows) - Windows `SystemMediaTransportControls` implementation for Flutter giving access to Windows OS Media Control applet.
-1. [spotify](https://github.com/rinukkusu/spotify-dart) - An incomplete dart library for interfacing with the Spotify Web API.
 1. [sqlite3](https://github.com/simolus3/sqlite3.dart/tree/main/sqlite3) - Provides lightweight yet convenient bindings to SQLite by using dart:ffi
 1. [sqlite3_flutter_libs](https://github.com/simolus3/sqlite3.dart/tree/main/sqlite3_flutter_libs) - Flutter plugin to include native sqlite3 libraries with your app
 1. [stroke_text](https://github.com/MohamedAbd0/stroke_text) - A Simple Flutter plugin for applying stroke (border) style to a text widget
@@ -350,4 +334,4 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 1. [flutter_new_pipe_extractor](https://github.com/KRTirtho/flutter_new_pipe_extractor) - NewPipeExtractor binding for Flutter (Android only)
 </details>
 
-<div align="center"><h4>© Copyright Spotube 2024</h4></div>
+<div align="center"><h4>© Copyright Spotube 2025</h4></div>

android/app/build.gradle

@@ -33,7 +33,7 @@ def composeVersion = "1.4.8"
 android {
     namespace "oss.krtirtho.spotube"
     
-    compileSdkVersion 35
+    compileSdkVersion 36
 
     ndkVersion = "27.0.12077973"
 

android/app/proguard-rules.pro

@@ -1,3 +1,12 @@
+#Flutter Wrapper
+# -keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+# -keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }
+-keep class de.prosiebensat1digital.** { *; }
+
 -keep class androidx.lifecycle.DefaultLifecycleObserver
 
 -keepnames class kotlinx.serialization.** { *; }
@@ -19,3 +28,32 @@
 -keep class org.mozilla.javascript.** { *; }
 -keep class org.mozilla.classfile.ClassFileWriter
 -dontwarn org.mozilla.javascript.tools.**
+
+-dontwarn javax.script.AbstractScriptEngine
+-dontwarn javax.script.Bindings
+-dontwarn javax.script.Compilable
+-dontwarn javax.script.CompiledScript
+-dontwarn javax.script.Invocable
+-dontwarn javax.script.ScriptContext
+-dontwarn javax.script.ScriptEngine
+-dontwarn javax.script.ScriptEngineFactory
+-dontwarn javax.script.ScriptException
+-dontwarn javax.script.SimpleBindings
+-dontwarn jdk.dynalink.CallSiteDescriptor
+-dontwarn jdk.dynalink.DynamicLinker
+-dontwarn jdk.dynalink.DynamicLinkerFactory
+-dontwarn jdk.dynalink.NamedOperation
+-dontwarn jdk.dynalink.Namespace
+-dontwarn jdk.dynalink.NamespaceOperation
+-dontwarn jdk.dynalink.Operation
+-dontwarn jdk.dynalink.RelinkableCallSite
+-dontwarn jdk.dynalink.StandardNamespace
+-dontwarn jdk.dynalink.StandardOperation
+-dontwarn jdk.dynalink.linker.GuardedInvocation
+-dontwarn jdk.dynalink.linker.GuardingDynamicLinker
+-dontwarn jdk.dynalink.linker.LinkRequest
+-dontwarn jdk.dynalink.linker.LinkerServices
+-dontwarn jdk.dynalink.linker.TypeBasedGuardingDynamicLinker
+-dontwarn jdk.dynalink.linker.support.CompositeTypeBasedGuardingDynamicLinker
+-dontwarn jdk.dynalink.linker.support.Guards
+-dontwarn jdk.dynalink.support.ChainedCallSite

android/app/src/debug/AndroidManifest.xml

@@ -3,4 +3,17 @@
          to allow setting breakpoints, to provide hot reload, etc.
     -->
   <uses-permission android:name="android.permission.INTERNET" />
+  <application
+    android:name="${applicationName}"
+    android:allowBackup="false"
+    android:fullBackupContent="false"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name_en"
+    android:requestLegacyExternalStorage="true"
+    android:usesCleartextTraffic="true">
+    <!-- Disable Impeller -->
+    <meta-data
+      android:name="io.flutter.embedding.android.EnableImpeller"
+      android:value="false" />
+  </application>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -57,10 +57,6 @@
 
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-
-        <data
-          android:host="open.spotify.com"
-          android:scheme="https" />
       </intent-filter>
 
       <intent-filter>
@@ -74,8 +70,6 @@
 
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <!-- Accepts URIs that begin with "spotify:// -->
-        <data android:scheme="spotify" />
         <data android:scheme="spotube" />
       </intent-filter>
 

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -6,7 +6,7 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-    <item>
+    <item android:bottom="0dp">
         <bitmap android:gravity="bottom" android:src="@drawable/branding"/>
     </item>
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -6,7 +6,7 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-    <item>
+    <item android:bottom="0dp">
         <bitmap android:gravity="bottom" android:src="@drawable/branding"/>
     </item>
 </layer-list>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-  <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
 </adaptive-icon>

android/app/src/nightly/res/drawable-v21/launch_background.xml

@@ -6,7 +6,7 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-    <item>
+    <item android:bottom="0dp">
         <bitmap android:gravity="bottom" android:src="@drawable/branding"/>
     </item>
 </layer-list>

android/app/src/nightly/res/drawable/launch_background.xml

@@ -6,7 +6,7 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-    <item>
+    <item android:bottom="0dp">
         <bitmap android:gravity="bottom" android:src="@drawable/branding"/>
     </item>
 </layer-list>

android/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background" />
-  <foreground android:drawable="@drawable/ic_launcher_foreground" />
-  <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
 </adaptive-icon>