Merge 5a14d2a7c8 into a8f70f201e

Release v5.0.0

.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,6 +5,7 @@
     "ambiguate",
     "Amoled",
     "Buildless",
+    "configurators",
     "danceability",
     "fuzzywuzzy",
     "gapless",
@@ -29,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"
 }

CHANGELOG.md

@@ -1,5 +1,68 @@
 # Changelog
 
+## [5.0.0](https://github.com/KRTirtho/spotube/compare/v4.0.2...v5.0.0) (2025-09-08)
+
+### Features
+
+- Add ISRC track search for YouTube ([#2594](https://github.com/KRTirtho/spotube/issues/2594))
+- Add new icons #2676 by @alexio-dev ([#2678](https://github.com/KRTirtho/spotube/issues/2678))
+- Add connect confirmation dialog
+- Add metadata api service and models
+- **metadata-plugin**: Add pagination support, feed and playlist CRUD endpoints
+- **metadata-plugin**: Add local storage api
+- Add webview, totp and setInterval apis for plugins
+- Enhance local storage and webview APIs with improved error handling and resource management
+- **metadata_plugin**: Add logout method
+- Update plugin configuration with more fields
+- Implement metadata plugins based on hetu
+- Update models to match hetu_spotube_plugin signature
+- Add user endpoint calls in metadata and paginated async notifiers
+- Add playlist endpoint and providers
+- Add albums metadata endpoint and provider
+- Add artist and album providers
+- Add track endpoint for metadata service
+- Remove green corp names formally
+- **metadata**: Add plugin form
+- Add support for entity specific search
+- Enhance image handling
+- Add support for automatic plugin repository from github and codeberg
+- Use isolate for youtube_explode engine
+- Add repository and plugin API version fields to metadata plugins
+- Update new pipe version
+- **metadata**: Add plugin update checker and dialog for available updates
+- Optimize track options and related artists
+- Add plugin scrobbling support and support button
+- Add ErrorBox and NoDefaultMetadataPlugin components
+
+### Bug Fixes
+
+- Calling /track/:streamId endpoint causes active sourced track to be anything
+- **mobile**: Dialogs in bottom sheet are not opening
+- Default accent color is orange but it shows blue in settings
+- Artist images are not loading up
+- CVE: Remote path traversal through websocket when devices are on same network
+- Endless playback not working
+- **android**: NewPipe invalid search content filters
+- Make YoutubeExplode engine faster
+- Create and delete playlist not working
+- Local track not working and images of local not showing up
+- Local playback not working for tracks with special # (hashtag) characters
+- Inaccessible streaming url causing rapid skips
+- **yt**: Fallback to different search result if all streaming url is inaccessible
+- **playback**: Skip network requests if cached file already exists
+- Yt-dlp playback not working and add partial support for HLS streaming
+- Windows webview2 environment permission issue
+- **playback**: Play not fetching full playlist if playlist is too long
+- **track_options**: Tapping on option doesn't close the menu
+- **playback**: Alternative track sources switch not working
+- **ui**: Lyrics white text in white background and small player buttons
+
+### Translation
+
+- Add Traditional Chinese translation ([#2762](https://github.com/KRTirtho/spotube/issues/2762))
+- Fix Japanese translations ([#2732](https://github.com/KRTirtho/spotube/issues/2732))
+- Correction of the dutch language ([#1306](https://github.com/KRTirtho/spotube/issues/1306))
+
 ## [4.0.2](https://github.com/krtirtho/spotube/compare/v4.0.1...v4.0.2) (2025-03-16)
 
 ### Bug Fixes

CONTRIBUTION.md

@@ -119,7 +119,7 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/KRTirt
 
 Do the following:
 
-- Download the latest Flutter SDK (>=3.16.0) & enable desktop support
+- Install [Dart](https://dart.dev/get-dart) and [fvm](https://fvm.app/documentation/getting-started/installation)
 - Install Development dependencies in linux
   - Debian (>=12/Bookworm)/Ubuntu
     ```bash
@@ -138,11 +138,11 @@ Do the following:
 - Create a `.env` in root of the project following the `.env.example` template
 - Now run the following to bootstrap the project
   ```bash
-  flutter pub get && dart run build_runner build --delete-conflicting-outputs --enable-experiment=records,patterns
+  fvm flutter pub get && fvm dart run build_runner build --delete-conflicting-outputs
   ```
 - Finally run these following commands in the root of the project to start the Spotube Locally
   ```bash
-  flutter run -d <window|macos|linux|(<android-device-id>)>
+  fvm flutter run -d <window|macos|linux|(<android-device-id>)>
   ```
 
 Do debugging/testing/build etc then submit to us with PR against the development branch (dev) & we'll review your code

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,8 +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 music client<br />
-utilizing selected music provider API and YouTube, Piped.video or JioSaavn as an audio source
+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 😉
 
@@ -18,31 +18,24 @@ Btw it's not just another Electron app 😉
 
 ---
 
-![Spotube Desktop](assets/spotube-screenshot.png)
+![Spotube Desktop](assets/branding/spotube-screenshot.png)
 
-![Spotube Mobile](assets/mobile-screenshots/combined.png)
+![Spotube Mobile](assets/branding/mobile-screenshots/combined.jpg)
 
 </div>
 
 ## 🌃 Features
 
-- 🚫 No ads, thanks to the use of public & free music metadata providers 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/tracks in music platforms (or preferably by buying their merch/concert tickets/physical media).
-
-### ❌ Unsupported features
-
-- 🗣️ **Shows & Podcasts:** Shows and Podcasts will <ins>**never be supported**</ins> because the audio tracks are <ins>_only_</ins> available on music providers and accessing them would require premium.
-- 🎧 **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
 
@@ -65,17 +58,21 @@ 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>
+  <tr>
+    <td>iOS</td>
+    <td>
+      <a href="https://github.com/KRTirtho/spotube/releases/download/nightly/Spotube-iOS.ipa">
+        <img width="220" alt="iOS Download" src="https://static.vecteezy.com/system/resources/previews/021/514/755/original/ios-icon-logo-software-phone-apple-symbol-with-name-white-design-mobile-illustration-with-black-background-free-vector.jpg">
       </a>
     </td>
   </tr>
   <tr>
     <td>Android</td>
     <td>
-      <a href="https://play.google.com/store/apps/details?id=oss.krtirtho.spotube">
-        <img width="220" alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png">
-      </a>
-      <br>
       <a href="https://github.com/KRTirtho/spotube/releases/latest/download/Spotube-android-all-arch.apk">
         <img width="220" alt="APK download" src="https://user-images.githubusercontent.com/114044633/223920025-83687de0-e463-4c5d-8122-e06e4bb7d40c.png">
       </a>
@@ -188,9 +185,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
 
@@ -198,7 +193,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>
@@ -209,14 +204,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. [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

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.** { *; }

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>
 

appdmg.json

@@ -1,6 +1,6 @@
 {
   "title": "Spotube",
-  "icon": "assets/spotube-logo-macos.png",
+  "icon": "assets/branding/spotube-logo-macos.png",
   "contents": [
     {
       "x": 448,

assets/fonts/Ubuntu_Mono/UFL.txt

@@ -0,0 +1,96 @@
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to
+a new environment.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. These can be included either as stand-alone
+text files, human-readable headers or in the appropriate machine-
+readable metadata fields within text or binary files as long as those
+fields can be easily viewed by the user.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.

choco-struct/spotube.nuspec

@@ -15,7 +15,7 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t
     <authors>Kingkor Roy Tirtho</authors>
     <projectUrl>https://spotube.krtirtho.dev</projectUrl>
     <iconUrl>
-      https://rawcdn.githack.com/KRTirtho/spotube/7edb0bb834eb18c05551e30a891720a6abf53dbe/assets/spotube-logo.png</iconUrl>
+      https://rawcdn.githack.com/KRTirtho/spotube/7edb0bb834eb18c05551e30a891720a6abf53dbe/assets/branding/spotube-logo.png</iconUrl>
     <copyright>2022 Spotube</copyright>
     <!-- If there is a license Url available, it is required for the community feed -->
     <licenseUrl>https://github.com/KRTirtho/spotube/blob/master/LICENSE</licenseUrl>

cli/commands/build/linux.dart

@@ -74,7 +74,7 @@ class LinuxBuildCommand extends Command with BuildCommandCommonSteps {
     ).copy(
       join(tempDir, "com.github.KRTirtho.Spotube.appdata.xml"),
     );
-    await File(join(cwd.path, "assets", "spotube-logo.png")).copy(
+    await File(join(cwd.path, "assets", "branding", "spotube-logo.png")).copy(
       join(tempDir, "spotube-logo.png"),
     );
 

cliff.toml

@@ -0,0 +1,92 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+
+[changelog]
+# A Tera template to be rendered for each release in the changelog.
+# See https://keats.github.io/tera/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}](<REPO>/compare/v{{ previous.version | trim_start_matches(pat="v") }}...v{{ version | trim_start_matches(pat="v") }}) ({{ timestamp | date(format="%Y-%m-%d") }})
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | striptags | trim | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.scope %}**{{ commit.scope }}**: {% endif %}\
+            {% if commit.breaking %}[**breaking**] {% endif %}\
+            {{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}
+"""
+# Remove leading and trailing whitespaces from the changelog's body.
+trim = true
+# Render body even when there are no releases to process.
+render_always = true
+# An array of regex based postprocessors to modify the changelog.
+postprocessors = [
+    # Replace the placeholder <REPO> with a URL.
+    { pattern = '<REPO>', replace = "https://github.com/KRTirtho/spotube" },
+]
+# render body even when there are no releases to process
+# render_always = true
+# output file path
+# output = "test.md"
+
+[git]
+# Parse commits according to the conventional commits specification.
+# See https://www.conventionalcommits.org
+conventional_commits = true
+# Exclude commits that do not match the conventional commits specification.
+filter_unconventional = true
+# Require all commits to be conventional.
+# Takes precedence over filter_unconventional.
+require_conventional = false
+# Split commits on newlines, treating each line as an individual commit.
+split_commits = false
+# An array of regex based parsers to modify commit messages prior to further processing.
+commit_preprocessors = [
+    # Replace issue numbers with link templates to be updated in `changelog.postprocessors`.
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/issues/${2}))" },
+    # Check spelling of the commit message using https://github.com/crate-ci/typos.
+    # If the spelling is incorrect, it will be fixed automatically.
+    #{ pattern = '.*', replace_command = 'typos --write-changes -' },
+]
+# Prevent commits that are breaking from being excluded by commit parsers.
+protect_breaking_commits = false
+# An array of regex based parsers for extracting data from the commit message.
+# Assigns commits to groups.
+# Optionally sets the commit's scope and can decide to exclude commits from further processing.
+commit_parsers = [
+    { message = "^feat", group = "<!-- 0 -->Features" },
+    { message = "^fix", group = "<!-- 1 -->Bug Fixes" },
+    { message = "^translation", group = "<!-- 3 --> Translation" },
+    # { message = "^perf", group = "<!-- 4 -->⚡ Performance" },
+    # { message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
+    # { message = "^style", group = "<!-- 5 -->🎨 Styling" },
+    # { message = "^test", group = "<!-- 6 -->🧪 Testing" },
+    # { message = "^chore\\(release\\): prepare for", skip = true },
+    # { message = "^chore\\(deps.*\\)", skip = true },
+    # { message = "^chore\\(pr\\)", skip = true },
+    # { message = "^chore\\(pull\\)", skip = true },
+    # { message = "^chore|^ci", group = "<!-- 7 -->⚙️ Miscellaneous Tasks" },
+    # { body = ".*security", group = "<!-- 8 -->🛡️ Security" },
+    # { message = "^revert", group = "<!-- 9 -->◀️ Revert" },
+    # { message = ".*", group = "<!-- 10 -->💼 Other" },
+]
+# Exclude commits that are not matched by any commit parser.
+filter_commits = true
+# An array of link parsers for extracting external references, and turning them into URLs, using regex.
+link_parsers = []
+# Include only the tags that belong to the current branch.
+use_branch_tags = false
+# Order releases topologically instead of chronologically.
+topo_order = false
+# Order releases topologically instead of chronologically.
+topo_order_commits = true
+# Order of commits in each group/release within the changelog.
+# Allowed values: newest, oldest
+sort_commits = "oldest"
+# Process submodules commits
+recurse_submodules = false

flutter_launcher_icons-nightly.yaml

@@ -1,6 +1,6 @@
 flutter_launcher_icons:
   android: true
   ios: true
-  image_path: "assets/spotube-nightly-logo.png"
-  adaptive_icon_foreground: "assets/spotube-nightly-logo-foreground.png"
+  image_path: "assets/branding/spotube-nightly-logo.png"
+  adaptive_icon_foreground: "assets/branding/spotube-nightly-logo-foreground.png"
   adaptive_icon_background: "#242832"

flutter_launcher_icons.yaml

@@ -1,19 +1,19 @@
 # flutter pub run flutter_launcher_icons
 flutter_launcher_icons:
-  image_path: "assets/spotube-logo.png"
+  image_path: "assets/branding/spotube-logo.png"
 
   android: true
-  # image_path_android: "assets/icon/icon.png"
+  # image_path_android: "assets/branding/icon/icon.png"
   min_sdk_android: 21 # android min sdk min:16, default 21
   adaptive_icon_background: "#242832"
-  adaptive_icon_foreground: "assets/spotube-logo-foreground.png"
-  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
+  adaptive_icon_foreground: "assets/branding/spotube-logo-foreground.png"
+  # adaptive_icon_monochrome: "assets/branding/icon/monochrome.png"
 
   ios: true
-  # image_path_ios: "assets/icon/icon.png"
+  # image_path_ios: "assets/branding/icon/icon.png"
   remove_alpha_channel_ios: true
-  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
-  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
+  # image_path_ios_dark_transparent: "assets/branding/icon/icon_dark.png"
+  # image_path_ios_tinted_grayscale: "assets/branding/icon/icon_tinted.png"
   # desaturate_tinted_to_grayscale_ios: true
 
   web:
@@ -21,9 +21,9 @@ flutter_launcher_icons:
 
   windows:
     generate: true
-    image_path: "assets/spotube-logo.png"
+    image_path: "assets/branding/spotube-logo.png"
     icon_size: 48 # min:48, max:256, default: 48
 
   macos:
     generate: true
-    image_path: "assets/spotube-logo-macos.png"
+    image_path: "assets/branding/spotube-logo-macos.png"

flutter_native_splash-nightly.yaml

@@ -1,9 +1,9 @@
 flutter_native_splash:
-  background_image: assets/bengali-patterns-bg.jpg
-  image: assets/spotube-nightly-logo.png
-  branding: assets/branding.png
+  background_image: assets/images/bengali-patterns-bg.jpg
+  image: assets/branding/spotube-nightly-logo.png
+  branding: assets/branding/branding.png
   android_12:
-    image: assets/spotube-nightly-logo_android12.png
-    branding: assets/branding.png
+    image: assets/branding/spotube-nightly-logo_android12.png
+    branding: assets/branding/branding.png
     color: "#000000"
     icon_background_color: "#000000"

ios/Podfile.lock

@@ -1,13 +1,16 @@
 PODS:
-  - app_links (0.0.2):
+  - app_links (6.4.1):
     - Flutter
   - audio_service (0.0.1):
     - Flutter
+    - FlutterMacOS
   - audio_session (0.0.1):
     - Flutter
   - bonsoir_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
+  - connectivity_plus (0.0.1):
+    - Flutter
   - device_info_plus (0.0.1):
     - Flutter
   - DKImagePickerController/Core (4.3.4):
@@ -46,6 +49,8 @@ PODS:
     - Flutter
   - file_selector_ios (0.0.1):
     - Flutter
+  - fk_user_agent (2.0.0):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_broadcasts (0.0.1):
     - Flutter
@@ -64,15 +69,17 @@ PODS:
     - Flutter
   - flutter_sharing_intent (0.0.1):
     - Flutter
+  - flutter_timezone (0.0.1):
+    - Flutter
   - home_widget (0.0.1):
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
   - integration_test (0.0.1):
     - Flutter
-  - media_kit_libs_ios_audio (1.0.4):
+  - irondash_engine_context (0.0.1):
     - Flutter
-  - media_kit_native_event_loop (1.0.0):
+  - media_kit_libs_ios_audio (1.0.4):
     - Flutter
   - metadata_god (0.0.1):
     - Flutter
@@ -95,25 +102,33 @@ PODS:
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
-  - sqlite3 (3.47.1):
-    - sqlite3/common (= 3.47.1)
-  - sqlite3/common (3.47.1)
-  - sqlite3/dbstatvtab (3.47.1):
+  - sqlite3 (3.50.4):
+    - sqlite3/common (= 3.50.4)
+  - sqlite3/common (3.50.4)
+  - sqlite3/dbstatvtab (3.50.4):
     - sqlite3/common
-  - sqlite3/fts5 (3.47.1):
+  - sqlite3/fts5 (3.50.4):
     - sqlite3/common
-  - sqlite3/perf-threadsafe (3.47.1):
+  - sqlite3/math (3.50.4):
     - sqlite3/common
-  - sqlite3/rtree (3.47.1):
+  - sqlite3/perf-threadsafe (3.50.4):
+    - sqlite3/common
+  - sqlite3/rtree (3.50.4):
+    - sqlite3/common
+  - sqlite3/session (3.50.4):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
     - FlutterMacOS
-    - sqlite3 (~> 3.47.1)
+    - sqlite3 (~> 3.50.4)
     - sqlite3/dbstatvtab
     - sqlite3/fts5
+    - sqlite3/math
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
+    - sqlite3/session
+  - super_native_extensions (0.0.1):
+    - Flutter
   - SwiftyGif (5.4.4)
   - system_theme (0.0.1):
     - Flutter
@@ -122,12 +137,14 @@ PODS:
 
 DEPENDENCIES:
   - app_links (from `.symlinks/plugins/app_links/ios`)
-  - audio_service (from `.symlinks/plugins/audio_service/ios`)
+  - audio_service (from `.symlinks/plugins/audio_service/darwin`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`)
+  - fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`)
   - Flutter (from `Flutter`)
   - flutter_broadcasts (from `.symlinks/plugins/flutter_broadcasts/ios`)
   - flutter_discord_rpc (from `.symlinks/plugins/flutter_discord_rpc/ios`)
@@ -135,11 +152,12 @@ DEPENDENCIES:
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_sharing_intent (from `.symlinks/plugins/flutter_sharing_intent/ios`)
+  - flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
   - home_widget (from `.symlinks/plugins/home_widget/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - irondash_engine_context (from `.symlinks/plugins/irondash_engine_context/ios`)
   - media_kit_libs_ios_audio (from `.symlinks/plugins/media_kit_libs_ios_audio/ios`)
-  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - metadata_god (from `.symlinks/plugins/metadata_god/ios`)
   - open_file_ios (from `.symlinks/plugins/open_file_ios/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -148,6 +166,7 @@ DEPENDENCIES:
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
+  - super_native_extensions (from `.symlinks/plugins/super_native_extensions/ios`)
   - system_theme (from `.symlinks/plugins/system_theme/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
@@ -164,17 +183,21 @@ EXTERNAL SOURCES:
   app_links:
     :path: ".symlinks/plugins/app_links/ios"
   audio_service:
-    :path: ".symlinks/plugins/audio_service/ios"
+    :path: ".symlinks/plugins/audio_service/darwin"
   audio_session:
     :path: ".symlinks/plugins/audio_session/ios"
   bonsoir_darwin:
     :path: ".symlinks/plugins/bonsoir_darwin/darwin"
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   file_selector_ios:
     :path: ".symlinks/plugins/file_selector_ios/ios"
+  fk_user_agent:
+    :path: ".symlinks/plugins/fk_user_agent/ios"
   Flutter:
     :path: Flutter
   flutter_broadcasts:
@@ -189,16 +212,18 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   flutter_sharing_intent:
     :path: ".symlinks/plugins/flutter_sharing_intent/ios"
+  flutter_timezone:
+    :path: ".symlinks/plugins/flutter_timezone/ios"
   home_widget:
     :path: ".symlinks/plugins/home_widget/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
+  irondash_engine_context:
+    :path: ".symlinks/plugins/irondash_engine_context/ios"
   media_kit_libs_ios_audio:
     :path: ".symlinks/plugins/media_kit_libs_ios_audio/ios"
-  media_kit_native_event_loop:
-    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
   metadata_god:
     :path: ".symlinks/plugins/metadata_god/ios"
   open_file_ios:
@@ -215,47 +240,53 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
   sqlite3_flutter_libs:
     :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
+  super_native_extensions:
+    :path: ".symlinks/plugins/super_native_extensions/ios"
   system_theme:
     :path: ".symlinks/plugins/system_theme/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
-  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
-  audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
-  bonsoir_darwin: e3b8526c42ca46a885142df84229131dfabea842
-  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
+  app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
+  audio_service: aa99a6ba2ae7565996015322b0bb024e1d25c6fd
+  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
+  bonsoir_darwin: 29c7ccf356646118844721f36e1de4b61f6cbd0e
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
-  file_selector_ios: f0670c1064a8c8450e38145d8043160105d0b97c
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_broadcasts: 3ece15b27d8ccbe2132c3df303e7c3401feab882
-  flutter_discord_rpc: e1c342f29ceb9dd76cdc01db59a70c93bb4d9ec5
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_native_splash: e8a1e01082d97a8099d973f919f57904c925008a
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  flutter_sharing_intent: e35380d0e1501d7111dbb7e46d5ac6339da6da98
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  media_kit_libs_ios_audio: 8f39d96a9c630685dfb844c289bd1d114c486fb3
-  media_kit_native_event_loop: 99111eded5acbdc9c2738021ea6550dd36ca8837
-  metadata_god: 4bbd8523cdb5d42c5e59d2fabad01ff8f4bc53f9
-  open_file_ios: 461db5853723763573e140de3193656f91990d9e
+  file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517
+  file_selector_ios: f92e583d43608aebc2e4a18daac30b8902845502
+  fk_user_agent: 137145b086229251761678fe034da53753f4ce59
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_broadcasts: 7bb7cc1024900a7f85e98b6faab795290b7c2339
+  flutter_discord_rpc: 0572e8227ea730c5afe5876a37c08c728ce95f3a
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_sharing_intent: afdc98985814d2c01d8c0956a177d6b6dfbdc373
+  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486
+  media_kit_libs_ios_audio: 905e6323b72e65c63ab9262b2e473f52c024a3a8
+  metadata_god: 018b59c2f3617569928550dcbd17481591557c1d
+  open_file_ios: 5ff7526df64e4394b4fe207636b67a95e83078bb
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  package_info_plus: 580e9a5f1b6ca5594e7c9ed5f92d1dfb2a66b5e1
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   SDWebImage: a81bbb3ba4ea5f810f4069c68727cb118467a04a
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
-  sqlite3: 1e522f0938463e44b7faf50393b40bdc1e1e456d
-  sqlite3_flutter_libs: 1b4e98da20ebd4e9b1240269b78cdcf492dbe9f3
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
+  sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
+  super_native_extensions: b763c02dc3a8fd078389f410bf15149179020cb4
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  system_theme: bfc1b0913d08f38d8c6bbe94b202a58df599d9f7
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  system_theme: a94f91f49eeb97cfa768c7d5a9b2f6aa51b00494
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
 
 PODFILE CHECKSUM: 0659b64ac6e9e96b61d8550decffa8bff51a957e
 

l10n.yaml

@@ -2,4 +2,3 @@ arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-dir: lib/l10n/generated
 untranslated-messages-file: untranslated_messages.json
-synthetic-package: false

lib/collections/assets.gen.dart

@@ -9,220 +9,89 @@
 
 import 'package:flutter/widgets.dart';
 
-class $AssetsBackgroundsGen {
-  const $AssetsBackgroundsGen();
+class $AssetsBrandingGen {
+  const $AssetsBrandingGen();
 
-  /// File path: assets/backgrounds/xmas-effect.png
-  AssetGenImage get xmasEffect =>
-      const AssetGenImage('assets/backgrounds/xmas-effect.png');
+  /// File path: assets/branding/spotube-logo-light.png
+  AssetGenImage get spotubeLogoLight =>
+      const AssetGenImage('assets/branding/spotube-logo-light.png');
+
+  /// File path: assets/branding/spotube-logo.ico
+  String get spotubeLogoIco => 'assets/branding/spotube-logo.ico';
+
+  /// File path: assets/branding/spotube-logo.png
+  AssetGenImage get spotubeLogoPng =>
+      const AssetGenImage('assets/branding/spotube-logo.png');
 
   /// List of all assets
-  List<AssetGenImage> get values => [xmasEffect];
+  List<dynamic> get values =>
+      [spotubeLogoLight, spotubeLogoIco, spotubeLogoPng];
 }
 
-class $AssetsLogosGen {
-  const $AssetsLogosGen();
+class $AssetsImagesGen {
+  const $AssetsImagesGen();
 
-  /// File path: assets/logos/songlink-transparent.png
-  AssetGenImage get songlinkTransparent =>
-      const AssetGenImage('assets/logos/songlink-transparent.png');
+  /// File path: assets/images/album-placeholder.png
+  AssetGenImage get albumPlaceholder =>
+      const AssetGenImage('assets/images/album-placeholder.png');
 
-  /// File path: assets/logos/songlink.png
-  AssetGenImage get songlink =>
-      const AssetGenImage('assets/logos/songlink.png');
+  /// File path: assets/images/bengali-patterns-bg.jpg
+  AssetGenImage get bengaliPatternsBg =>
+      const AssetGenImage('assets/images/bengali-patterns-bg.jpg');
 
-  /// List of all assets
-  List<AssetGenImage> get values => [songlinkTransparent, songlink];
-}
+  /// File path: assets/images/liked-tracks.jpg
+  AssetGenImage get likedTracks =>
+      const AssetGenImage('assets/images/liked-tracks.jpg');
 
-class $AssetsPatternsGen {
-  const $AssetsPatternsGen();
+  /// Directory path: assets/images/logos
+  $AssetsImagesLogosGen get logos => const $AssetsImagesLogosGen();
 
-  /// File path: assets/patterns/black_white_visualized.jpg
-  AssetGenImage get blackWhiteVisualized =>
-      const AssetGenImage('assets/patterns/black_white_visualized.jpg');
+  /// File path: assets/images/placeholder.png
+  AssetGenImage get placeholder =>
+      const AssetGenImage('assets/images/placeholder.png');
 
-  /// File path: assets/patterns/brazil_carnival.jpg
-  AssetGenImage get brazilCarnival =>
-      const AssetGenImage('assets/patterns/brazil_carnival.jpg');
-
-  /// File path: assets/patterns/cotton_balls.jpg
-  AssetGenImage get cottonBalls =>
-      const AssetGenImage('assets/patterns/cotton_balls.jpg');
-
-  /// File path: assets/patterns/cute_worms.jpg
-  AssetGenImage get cuteWorms =>
-      const AssetGenImage('assets/patterns/cute_worms.jpg');
-
-  /// File path: assets/patterns/flash_cross_axis.jpg
-  AssetGenImage get flashCrossAxis =>
-      const AssetGenImage('assets/patterns/flash_cross_axis.jpg');
-
-  /// File path: assets/patterns/memphis_shapes.jpg
-  AssetGenImage get memphisShapes =>
-      const AssetGenImage('assets/patterns/memphis_shapes.jpg');
-
-  /// File path: assets/patterns/oval_gloomy.jpg
-  AssetGenImage get ovalGloomy =>
-      const AssetGenImage('assets/patterns/oval_gloomy.jpg');
-
-  /// File path: assets/patterns/oval_sunny.jpg
-  AssetGenImage get ovalSunny =>
-      const AssetGenImage('assets/patterns/oval_sunny.jpg');
-
-  /// File path: assets/patterns/red_nimbuses.jpg
-  AssetGenImage get redNimbuses =>
-      const AssetGenImage('assets/patterns/red_nimbuses.jpg');
-
-  /// File path: assets/patterns/tree_bark.jpg
-  AssetGenImage get treeBark =>
-      const AssetGenImage('assets/patterns/tree_bark.jpg');
-
-  /// File path: assets/patterns/vibrant_pentagons.jpg
-  AssetGenImage get vibrantPentagons =>
-      const AssetGenImage('assets/patterns/vibrant_pentagons.jpg');
-
-  /// File path: assets/patterns/wiring_pattern.jpg
-  AssetGenImage get wiringPattern =>
-      const AssetGenImage('assets/patterns/wiring_pattern.jpg');
-
-  /// File path: assets/patterns/zigzags_gloomy.jpg
-  AssetGenImage get zigzagsGloomy =>
-      const AssetGenImage('assets/patterns/zigzags_gloomy.jpg');
-
-  /// File path: assets/patterns/zigzags_sunny.jpg
-  AssetGenImage get zigzagsSunny =>
-      const AssetGenImage('assets/patterns/zigzags_sunny.jpg');
+  /// File path: assets/images/user-placeholder.png
+  AssetGenImage get userPlaceholder =>
+      const AssetGenImage('assets/images/user-placeholder.png');
 
   /// List of all assets
   List<AssetGenImage> get values => [
-        blackWhiteVisualized,
-        brazilCarnival,
-        cottonBalls,
-        cuteWorms,
-        flashCrossAxis,
-        memphisShapes,
-        ovalGloomy,
-        ovalSunny,
-        redNimbuses,
-        treeBark,
-        vibrantPentagons,
-        wiringPattern,
-        zigzagsGloomy,
-        zigzagsSunny
+        albumPlaceholder,
+        bengaliPatternsBg,
+        likedTracks,
+        placeholder,
+        userPlaceholder
       ];
 }
 
-class $AssetsTutorialGen {
-  const $AssetsTutorialGen();
+class $AssetsImagesLogosGen {
+  const $AssetsImagesLogosGen();
 
-  /// File path: assets/tutorial/step-1.png
-  AssetGenImage get step1 => const AssetGenImage('assets/tutorial/step-1.png');
+  /// File path: assets/images/logos/invidious.jpg
+  AssetGenImage get invidious =>
+      const AssetGenImage('assets/images/logos/invidious.jpg');
 
-  /// File path: assets/tutorial/step-2.png
-  AssetGenImage get step2 => const AssetGenImage('assets/tutorial/step-2.png');
+  /// File path: assets/images/logos/jiosaavn.png
+  AssetGenImage get jiosaavn =>
+      const AssetGenImage('assets/images/logos/jiosaavn.png');
 
-  /// File path: assets/tutorial/step-3.png
-  AssetGenImage get step3 => const AssetGenImage('assets/tutorial/step-3.png');
+  /// File path: assets/images/logos/songlink-transparent.png
+  AssetGenImage get songlinkTransparent =>
+      const AssetGenImage('assets/images/logos/songlink-transparent.png');
 
   /// List of all assets
-  List<AssetGenImage> get values => [step1, step2, step3];
+  List<AssetGenImage> get values => [invidious, jiosaavn, songlinkTransparent];
 }
 
 class Assets {
   Assets._();
 
   static const String license = 'LICENSE';
-  static const AssetGenImage albumPlaceholder =
-      AssetGenImage('assets/album-placeholder.png');
-  static const $AssetsBackgroundsGen backgrounds = $AssetsBackgroundsGen();
-  static const AssetGenImage bengaliPatternsBg =
-      AssetGenImage('assets/bengali-patterns-bg.jpg');
-  static const AssetGenImage branding = AssetGenImage('assets/branding.png');
-  static const AssetGenImage emptyBox = AssetGenImage('assets/empty_box.png');
-  static const AssetGenImage invidious = AssetGenImage('assets/invidious.jpg');
-  static const AssetGenImage jiosaavn = AssetGenImage('assets/jiosaavn.png');
-  static const AssetGenImage likedTracks =
-      AssetGenImage('assets/liked-tracks.jpg');
-  static const $AssetsLogosGen logos = $AssetsLogosGen();
-  static const $AssetsPatternsGen patterns = $AssetsPatternsGen();
-  static const AssetGenImage placeholder =
-      AssetGenImage('assets/placeholder.png');
-  static const AssetGenImage spotubeHeroBanner =
-      AssetGenImage('assets/spotube-hero-banner.png');
-  static const AssetGenImage spotubeLogoForeground =
-      AssetGenImage('assets/spotube-logo-foreground.png');
-  static const AssetGenImage spotubeLogoItem =
-      AssetGenImage('assets/spotube-logo-item.png');
-  static const AssetGenImage spotubeLogoLight =
-      AssetGenImage('assets/spotube-logo-light.png');
-  static const AssetGenImage spotubeLogoMacos =
-      AssetGenImage('assets/spotube-logo-macos.png');
-  static const AssetGenImage spotubeLogoBmp =
-      AssetGenImage('assets/spotube-logo.bmp');
-  static const String spotubeLogoIco = 'assets/spotube-logo.ico';
-  static const AssetGenImage spotubeLogoPng =
-      AssetGenImage('assets/spotube-logo.png');
-  static const AssetGenImage spotubeLogoAndroid12 =
-      AssetGenImage('assets/spotube-logo_android12.png');
-  static const AssetGenImage spotubeNightlyItem =
-      AssetGenImage('assets/spotube-nightly-item.png');
-  static const AssetGenImage spotubeNightlyLogoForegroundPng =
-      AssetGenImage('assets/spotube-nightly-logo-foreground.png');
-  static const String spotubeNightlyLogoForegroundSvg =
-      'assets/spotube-nightly-logo-foreground.svg';
-  static const AssetGenImage spotubeNightlyLogo =
-      AssetGenImage('assets/spotube-nightly-logo.png');
-  static const AssetGenImage spotubeNightlyLogoAndroid12 =
-      AssetGenImage('assets/spotube-nightly-logo_android12.png');
-  static const AssetGenImage spotubeScreenshot =
-      AssetGenImage('assets/spotube-screenshot.png');
-  static const AssetGenImage spotubeTallCapsule =
-      AssetGenImage('assets/spotube-tall-capsule.png');
-  static const AssetGenImage spotubeWideCapsuleLarge =
-      AssetGenImage('assets/spotube-wide-capsule-large.png');
-  static const AssetGenImage spotubeWideCapsuleSmall =
-      AssetGenImage('assets/spotube-wide-capsule-small.png');
-  static const AssetGenImage spotubeBanner =
-      AssetGenImage('assets/spotube_banner.png');
-  static const AssetGenImage success = AssetGenImage('assets/success.png');
-  static const $AssetsTutorialGen tutorial = $AssetsTutorialGen();
-  static const AssetGenImage userPlaceholder =
-      AssetGenImage('assets/user-placeholder.png');
+  static const $AssetsBrandingGen branding = $AssetsBrandingGen();
+  static const $AssetsImagesGen images = $AssetsImagesGen();
 
   /// List of all assets
-  static List<dynamic> get values => [
-        license,
-        albumPlaceholder,
-        bengaliPatternsBg,
-        branding,
-        emptyBox,
-        invidious,
-        jiosaavn,
-        likedTracks,
-        placeholder,
-        spotubeHeroBanner,
-        spotubeLogoForeground,
-        spotubeLogoItem,
-        spotubeLogoLight,
-        spotubeLogoMacos,
-        spotubeLogoBmp,
-        spotubeLogoIco,
-        spotubeLogoPng,
-        spotubeLogoAndroid12,
-        spotubeNightlyItem,
-        spotubeNightlyLogoForegroundPng,
-        spotubeNightlyLogoForegroundSvg,
-        spotubeNightlyLogo,
-        spotubeNightlyLogoAndroid12,
-        spotubeScreenshot,
-        spotubeTallCapsule,
-        spotubeWideCapsuleLarge,
-        spotubeWideCapsuleSmall,
-        spotubeBanner,
-        success,
-        userPlaceholder
-      ];
+  static List<String> get values => [license];
 }
 
 class AssetGenImage {

lib/collections/env.dart

@@ -10,9 +10,6 @@ enum ReleaseChannel {
 
 @Envied(obfuscate: true, requireEnvFile: true, path: ".env")
 abstract class Env {
-  @EnviedField(varName: 'SPOTIFY_SECRETS')
-  static final String rawSpotifySecrets = _Env.rawSpotifySecrets;
-
   @EnviedField(varName: 'LASTFM_API_KEY')
   static final String lastFmApiKey = _Env.lastFmApiKey;
 
@@ -24,25 +21,12 @@ abstract class Env {
 
   static bool get hideDonations => _hideDonations == 1;
 
-  static final spotifySecrets = rawSpotifySecrets.split(',').map((e) {
-    final secrets = e.trim().split(":").map((e) => e.trim());
-    return {
-      "clientId": secrets.first,
-      "clientSecret": secrets.last,
-    };
-  }).toList();
-
   @EnviedField(varName: 'ENABLE_UPDATE_CHECK', defaultValue: "1")
   static final String _enableUpdateChecker = _Env._enableUpdateChecker;
 
   @EnviedField(varName: "RELEASE_CHANNEL", defaultValue: "nightly")
   static final String _releaseChannel = _Env._releaseChannel;
 
-  @EnviedField(varName: "DISABLE_SPOTIFY_IMAGES", defaultValue: "0")
-  static final String _disableSpotifyImages = _Env._disableSpotifyImages;
-
-  static bool get disableSpotifyImages => _disableSpotifyImages == "1";
-
   static ReleaseChannel get releaseChannel => _releaseChannel == "stable"
       ? ReleaseChannel.stable
       : ReleaseChannel.nightly;