diff --git a/Makefile b/Makefile index 48626312..decbd0c4 100644 --- a/Makefile +++ b/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) diff --git a/README.md b/README.md index 26bb1d71..b1b2fc66 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ That means, in the upcoming new versions, you will no longer be able to login wi > Spotube has no affiliation with Spotify™ or any of its subsidiaries.
- Spotube Logo + Spotube Logo An open source, cross-platform music client
utilizing selected music provider API and YouTube®, Piped.video or JioSaavn as an audio source diff --git a/android/app/build.gradle b/android/app/build.gradle index 5051f5a3..ee481eca 100644 --- a/android/app/build.gradle +++ b/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" diff --git a/appdmg.json b/appdmg.json index eb9b5236..6e365f23 100644 --- a/appdmg.json +++ b/appdmg.json @@ -1,6 +1,6 @@ { "title": "Spotube", - "icon": "assets/spotube-logo-macos.png", + "icon": "assets/branding/spotube-logo-macos.png", "contents": [ { "x": 448, @@ -15,4 +15,4 @@ "path": "build/macos/Build/Products/Release/Spotube.app" } ] -} \ No newline at end of file +} diff --git a/assets/backgrounds/xmas-effect.png b/assets/backgrounds/xmas-effect.png deleted file mode 100644 index e7c8eeef..00000000 Binary files a/assets/backgrounds/xmas-effect.png and /dev/null differ diff --git a/assets/bengali-patterns-bg.jpg b/assets/bengali-patterns-bg.jpg deleted file mode 100644 index 513557a3..00000000 Binary files a/assets/bengali-patterns-bg.jpg and /dev/null differ diff --git a/assets/branding.png b/assets/branding/branding.png similarity index 100% rename from assets/branding.png rename to assets/branding/branding.png diff --git a/assets/mobile-screenshots/android-1.jpg b/assets/branding/mobile-screenshots/android-1.jpg similarity index 100% rename from assets/mobile-screenshots/android-1.jpg rename to assets/branding/mobile-screenshots/android-1.jpg diff --git a/assets/mobile-screenshots/android-2.jpg b/assets/branding/mobile-screenshots/android-2.jpg similarity index 100% rename from assets/mobile-screenshots/android-2.jpg rename to assets/branding/mobile-screenshots/android-2.jpg diff --git a/assets/mobile-screenshots/android-3.jpg b/assets/branding/mobile-screenshots/android-3.jpg similarity index 100% rename from assets/mobile-screenshots/android-3.jpg rename to assets/branding/mobile-screenshots/android-3.jpg diff --git a/assets/mobile-screenshots/android-4.jpg b/assets/branding/mobile-screenshots/android-4.jpg similarity index 100% rename from assets/mobile-screenshots/android-4.jpg rename to assets/branding/mobile-screenshots/android-4.jpg diff --git a/assets/mobile-screenshots/android-5.jpg b/assets/branding/mobile-screenshots/android-5.jpg similarity index 100% rename from assets/mobile-screenshots/android-5.jpg rename to assets/branding/mobile-screenshots/android-5.jpg diff --git a/assets/mobile-screenshots/android-6.jpg b/assets/branding/mobile-screenshots/android-6.jpg similarity index 100% rename from assets/mobile-screenshots/android-6.jpg rename to assets/branding/mobile-screenshots/android-6.jpg diff --git a/assets/mobile-screenshots/combined.png b/assets/branding/mobile-screenshots/combined.png similarity index 100% rename from assets/mobile-screenshots/combined.png rename to assets/branding/mobile-screenshots/combined.png diff --git a/assets/spotube-hero-banner.png b/assets/branding/spotube-hero-banner.png similarity index 100% rename from assets/spotube-hero-banner.png rename to assets/branding/spotube-hero-banner.png diff --git a/assets/spotube-logo-foreground.png b/assets/branding/spotube-logo-foreground.png similarity index 100% rename from assets/spotube-logo-foreground.png rename to assets/branding/spotube-logo-foreground.png diff --git a/assets/spotube-logo-item.png b/assets/branding/spotube-logo-item.png similarity index 100% rename from assets/spotube-logo-item.png rename to assets/branding/spotube-logo-item.png diff --git a/assets/spotube-logo-light.png b/assets/branding/spotube-logo-light.png similarity index 100% rename from assets/spotube-logo-light.png rename to assets/branding/spotube-logo-light.png diff --git a/assets/spotube-logo-macos.png b/assets/branding/spotube-logo-macos.png similarity index 100% rename from assets/spotube-logo-macos.png rename to assets/branding/spotube-logo-macos.png diff --git a/assets/spotube-logo.bmp b/assets/branding/spotube-logo.bmp similarity index 100% rename from assets/spotube-logo.bmp rename to assets/branding/spotube-logo.bmp diff --git a/assets/spotube-logo.ico b/assets/branding/spotube-logo.ico similarity index 100% rename from assets/spotube-logo.ico rename to assets/branding/spotube-logo.ico diff --git a/assets/spotube-logo.png b/assets/branding/spotube-logo.png similarity index 100% rename from assets/spotube-logo.png rename to assets/branding/spotube-logo.png diff --git a/assets/spotube-logo_android12.png b/assets/branding/spotube-logo_android12.png similarity index 100% rename from assets/spotube-logo_android12.png rename to assets/branding/spotube-logo_android12.png diff --git a/assets/spotube-nightly-item.png b/assets/branding/spotube-nightly-item.png similarity index 100% rename from assets/spotube-nightly-item.png rename to assets/branding/spotube-nightly-item.png diff --git a/assets/spotube-nightly-logo-foreground.png b/assets/branding/spotube-nightly-logo-foreground.png similarity index 100% rename from assets/spotube-nightly-logo-foreground.png rename to assets/branding/spotube-nightly-logo-foreground.png diff --git a/assets/spotube-nightly-logo-foreground.svg b/assets/branding/spotube-nightly-logo-foreground.svg similarity index 100% rename from assets/spotube-nightly-logo-foreground.svg rename to assets/branding/spotube-nightly-logo-foreground.svg diff --git a/assets/spotube-nightly-logo.png b/assets/branding/spotube-nightly-logo.png similarity index 100% rename from assets/spotube-nightly-logo.png rename to assets/branding/spotube-nightly-logo.png diff --git a/assets/spotube-nightly-logo_android12.png b/assets/branding/spotube-nightly-logo_android12.png similarity index 100% rename from assets/spotube-nightly-logo_android12.png rename to assets/branding/spotube-nightly-logo_android12.png diff --git a/assets/spotube-screenshot.png b/assets/branding/spotube-screenshot.png similarity index 100% rename from assets/spotube-screenshot.png rename to assets/branding/spotube-screenshot.png diff --git a/assets/spotube-tall-capsule.png b/assets/branding/spotube-tall-capsule.png similarity index 100% rename from assets/spotube-tall-capsule.png rename to assets/branding/spotube-tall-capsule.png diff --git a/assets/spotube-wide-capsule-large.png b/assets/branding/spotube-wide-capsule-large.png similarity index 100% rename from assets/spotube-wide-capsule-large.png rename to assets/branding/spotube-wide-capsule-large.png diff --git a/assets/spotube-wide-capsule-small.png b/assets/branding/spotube-wide-capsule-small.png similarity index 100% rename from assets/spotube-wide-capsule-small.png rename to assets/branding/spotube-wide-capsule-small.png diff --git a/assets/spotube_banner.png b/assets/branding/spotube_banner.png similarity index 100% rename from assets/spotube_banner.png rename to assets/branding/spotube_banner.png diff --git a/assets/empty_box.png b/assets/empty_box.png deleted file mode 100644 index 24e95b23..00000000 Binary files a/assets/empty_box.png and /dev/null differ diff --git a/assets/album-placeholder.png b/assets/images/album-placeholder.png similarity index 100% rename from assets/album-placeholder.png rename to assets/images/album-placeholder.png diff --git a/assets/images/bengali-patterns-bg.jpg b/assets/images/bengali-patterns-bg.jpg new file mode 100644 index 00000000..a4090a01 Binary files /dev/null and b/assets/images/bengali-patterns-bg.jpg differ diff --git a/assets/images/liked-tracks.jpg b/assets/images/liked-tracks.jpg new file mode 100644 index 00000000..71e010dc Binary files /dev/null and b/assets/images/liked-tracks.jpg differ diff --git a/assets/images/logos/invidious.jpg b/assets/images/logos/invidious.jpg new file mode 100644 index 00000000..3a54ace1 Binary files /dev/null and b/assets/images/logos/invidious.jpg differ diff --git a/assets/jiosaavn.png b/assets/images/logos/jiosaavn.png similarity index 100% rename from assets/jiosaavn.png rename to assets/images/logos/jiosaavn.png diff --git a/assets/images/logos/songlink-transparent.png b/assets/images/logos/songlink-transparent.png new file mode 100644 index 00000000..fc4ae541 Binary files /dev/null and b/assets/images/logos/songlink-transparent.png differ diff --git a/assets/placeholder.png b/assets/images/placeholder.png similarity index 100% rename from assets/placeholder.png rename to assets/images/placeholder.png diff --git a/assets/user-placeholder.png b/assets/images/user-placeholder.png similarity index 100% rename from assets/user-placeholder.png rename to assets/images/user-placeholder.png diff --git a/assets/invidious.jpg b/assets/invidious.jpg deleted file mode 100644 index 12c5f107..00000000 Binary files a/assets/invidious.jpg and /dev/null differ diff --git a/assets/liked-tracks.jpg b/assets/liked-tracks.jpg deleted file mode 100644 index 62dad65e..00000000 Binary files a/assets/liked-tracks.jpg and /dev/null differ diff --git a/assets/logos/songlink-transparent.png b/assets/logos/songlink-transparent.png deleted file mode 100644 index 6b7064c9..00000000 Binary files a/assets/logos/songlink-transparent.png and /dev/null differ diff --git a/assets/logos/songlink.png b/assets/logos/songlink.png deleted file mode 100644 index 43d823a5..00000000 Binary files a/assets/logos/songlink.png and /dev/null differ diff --git a/assets/patterns/black_white_visualized.jpg b/assets/patterns/black_white_visualized.jpg deleted file mode 100644 index e56a2780..00000000 Binary files a/assets/patterns/black_white_visualized.jpg and /dev/null differ diff --git a/assets/patterns/brazil_carnival.jpg b/assets/patterns/brazil_carnival.jpg deleted file mode 100644 index a7cdb3a1..00000000 Binary files a/assets/patterns/brazil_carnival.jpg and /dev/null differ diff --git a/assets/patterns/cotton_balls.jpg b/assets/patterns/cotton_balls.jpg deleted file mode 100644 index db6f02a8..00000000 Binary files a/assets/patterns/cotton_balls.jpg and /dev/null differ diff --git a/assets/patterns/cute_worms.jpg b/assets/patterns/cute_worms.jpg deleted file mode 100644 index 0c9f4fbb..00000000 Binary files a/assets/patterns/cute_worms.jpg and /dev/null differ diff --git a/assets/patterns/flash_cross_axis.jpg b/assets/patterns/flash_cross_axis.jpg deleted file mode 100644 index c6e52283..00000000 Binary files a/assets/patterns/flash_cross_axis.jpg and /dev/null differ diff --git a/assets/patterns/memphis_shapes.jpg b/assets/patterns/memphis_shapes.jpg deleted file mode 100644 index 2db8e775..00000000 Binary files a/assets/patterns/memphis_shapes.jpg and /dev/null differ diff --git a/assets/patterns/oval_gloomy.jpg b/assets/patterns/oval_gloomy.jpg deleted file mode 100644 index b44bf945..00000000 Binary files a/assets/patterns/oval_gloomy.jpg and /dev/null differ diff --git a/assets/patterns/oval_sunny.jpg b/assets/patterns/oval_sunny.jpg deleted file mode 100644 index bc07ae83..00000000 Binary files a/assets/patterns/oval_sunny.jpg and /dev/null differ diff --git a/assets/patterns/red_nimbuses.jpg b/assets/patterns/red_nimbuses.jpg deleted file mode 100644 index 6527999c..00000000 Binary files a/assets/patterns/red_nimbuses.jpg and /dev/null differ diff --git a/assets/patterns/tree_bark.jpg b/assets/patterns/tree_bark.jpg deleted file mode 100644 index 0dac37d7..00000000 Binary files a/assets/patterns/tree_bark.jpg and /dev/null differ diff --git a/assets/patterns/vibrant_pentagons.jpg b/assets/patterns/vibrant_pentagons.jpg deleted file mode 100644 index d9e8d537..00000000 Binary files a/assets/patterns/vibrant_pentagons.jpg and /dev/null differ diff --git a/assets/patterns/wiring_pattern.jpg b/assets/patterns/wiring_pattern.jpg deleted file mode 100644 index 9fc3b781..00000000 Binary files a/assets/patterns/wiring_pattern.jpg and /dev/null differ diff --git a/assets/patterns/zigzags_gloomy.jpg b/assets/patterns/zigzags_gloomy.jpg deleted file mode 100644 index c6ccd2a3..00000000 Binary files a/assets/patterns/zigzags_gloomy.jpg and /dev/null differ diff --git a/assets/patterns/zigzags_sunny.jpg b/assets/patterns/zigzags_sunny.jpg deleted file mode 100644 index 7470d5ef..00000000 Binary files a/assets/patterns/zigzags_sunny.jpg and /dev/null differ diff --git a/assets/success.png b/assets/success.png deleted file mode 100644 index 65cdba35..00000000 Binary files a/assets/success.png and /dev/null differ diff --git a/assets/tutorial/step-1.png b/assets/tutorial/step-1.png deleted file mode 100644 index 1182f054..00000000 Binary files a/assets/tutorial/step-1.png and /dev/null differ diff --git a/assets/tutorial/step-2.png b/assets/tutorial/step-2.png deleted file mode 100644 index af4616b0..00000000 Binary files a/assets/tutorial/step-2.png and /dev/null differ diff --git a/assets/tutorial/step-3.png b/assets/tutorial/step-3.png deleted file mode 100644 index ddbea140..00000000 Binary files a/assets/tutorial/step-3.png and /dev/null differ diff --git a/choco-struct/spotube.nuspec b/choco-struct/spotube.nuspec index e3588d98..40941c08 100644 --- a/choco-struct/spotube.nuspec +++ b/choco-struct/spotube.nuspec @@ -15,7 +15,7 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t Kingkor Roy Tirtho https://spotube.krtirtho.dev - https://rawcdn.githack.com/KRTirtho/spotube/7edb0bb834eb18c05551e30a891720a6abf53dbe/assets/spotube-logo.png + https://rawcdn.githack.com/KRTirtho/spotube/7edb0bb834eb18c05551e30a891720a6abf53dbe/assets/branding/spotube-logo.png 2022 Spotube https://github.com/KRTirtho/spotube/blob/master/LICENSE diff --git a/cli/commands/build/linux.dart b/cli/commands/build/linux.dart index 3fd8a0b9..378f5a72 100644 --- a/cli/commands/build/linux.dart +++ b/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"), ); diff --git a/flutter_launcher_icons-nightly.yaml b/flutter_launcher_icons-nightly.yaml index 770033bd..9e4e805c 100644 --- a/flutter_launcher_icons-nightly.yaml +++ b/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" diff --git a/flutter_launcher_icons.yaml b/flutter_launcher_icons.yaml index 2c558583..e5b26882 100644 --- a/flutter_launcher_icons.yaml +++ b/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" diff --git a/flutter_native_splash-nightly.yaml b/flutter_native_splash-nightly.yaml index 37da37d9..3b7daeec 100644 --- a/flutter_native_splash-nightly.yaml +++ b/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" diff --git a/lib/collections/assets.gen.dart b/lib/collections/assets.gen.dart index 09b6cdd2..739298e4 100644 --- a/lib/collections/assets.gen.dart +++ b/lib/collections/assets.gen.dart @@ -9,220 +9,85 @@ 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.png + AssetGenImage get spotubeLogo => + const AssetGenImage('assets/branding/spotube-logo.png'); /// List of all assets - List get values => [xmasEffect]; + List get values => [spotubeLogoLight, spotubeLogo]; } -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 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 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 get values => [step1, step2, step3]; + List 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 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 get values => [license]; } class AssetGenImage { diff --git a/lib/collections/fonts.gen.dart b/lib/collections/fonts.gen.dart index c51dfd40..16cc6e82 100644 --- a/lib/collections/fonts.gen.dart +++ b/lib/collections/fonts.gen.dart @@ -18,4 +18,7 @@ class FontFamily { /// Font family: RadixIcons static const String radixIcons = 'RadixIcons'; + + /// Font family: Ubuntu Mono + static const String ubuntuMono = 'Ubuntu Mono'; } diff --git a/lib/components/image/universal_image.dart b/lib/components/image/universal_image.dart index d8902e63..e157f96a 100644 --- a/lib/components/image/universal_image.dart +++ b/lib/components/image/universal_image.dart @@ -58,10 +58,10 @@ class UniversalImage extends HookWidget { ), height: height, width: width, - placeholder: AssetImage(placeholder ?? Assets.placeholder.path), + placeholder: AssetImage(placeholder ?? Assets.images.placeholder.path), imageErrorBuilder: (context, error, stackTrace) { return Image.asset( - placeholder ?? Assets.placeholder.path, + placeholder ?? Assets.images.placeholder.path, width: width, height: height, cacheHeight: height?.toInt(), @@ -82,7 +82,7 @@ class UniversalImage extends HookWidget { fit: fit, errorBuilder: (context, error, stackTrace) { return Image.asset( - placeholder ?? Assets.placeholder.path, + placeholder ?? Assets.images.placeholder.path, width: width, height: height, cacheHeight: height?.toInt(), @@ -102,7 +102,7 @@ class UniversalImage extends HookWidget { fit: fit, errorBuilder: (context, error, stackTrace) { return Image.asset( - placeholder ?? Assets.placeholder.path, + placeholder ?? Assets.images.placeholder.path, width: width, height: height, cacheHeight: height?.toInt(), @@ -123,7 +123,7 @@ class UniversalImage extends HookWidget { fit: fit, errorBuilder: (context, error, stackTrace) { return Image.asset( - placeholder ?? Assets.placeholder.path, + placeholder ?? Assets.images.placeholder.path, width: width, height: height, cacheHeight: height?.toInt(), diff --git a/lib/components/track_tile/track_options.dart b/lib/components/track_tile/track_options.dart index be8c35b6..2fbe1c26 100644 --- a/lib/components/track_tile/track_options.dart +++ b/lib/components/track_tile/track_options.dart @@ -254,7 +254,7 @@ class TrackOptions extends HookConsumerWidget { playlistId, ); }, - leading: Assets.logos.songlinkTransparent.image( + leading: Assets.images.logos.songlinkTransparent.image( width: 22, height: 22, color: colorScheme.foreground.withValues(alpha: 0.5), diff --git a/lib/models/connect/connect.freezed.dart b/lib/models/connect/connect.freezed.dart index 157d0911..9f9b558b 100644 --- a/lib/models/connect/connect.freezed.dart +++ b/lib/models/connect/connect.freezed.dart @@ -112,13 +112,8 @@ mixin _$WebSocketLoadEventData { required TResult orElse(), }) => throw _privateConstructorUsedError; - - /// Serializes this WebSocketLoadEventData to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $WebSocketLoadEventDataCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -147,8 +142,6 @@ class _$WebSocketLoadEventDataCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -197,8 +190,6 @@ class __$$WebSocketLoadEventDataPlaylistImplCopyWithImpl<$Res> $Res Function(_$WebSocketLoadEventDataPlaylistImpl) _then) : super(_value, _then); - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -222,8 +213,6 @@ class __$$WebSocketLoadEventDataPlaylistImplCopyWithImpl<$Res> )); } - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $SpotubeSimplePlaylistObjectCopyWith<$Res>? get collection { @@ -292,14 +281,12 @@ class _$WebSocketLoadEventDataPlaylistImpl other.initialIndex == initialIndex)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(_tracks), collection, initialIndex); - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$WebSocketLoadEventDataPlaylistImplCopyWith< @@ -433,11 +420,8 @@ abstract class WebSocketLoadEventDataPlaylist extends WebSocketLoadEventData { SpotubeSimplePlaylistObject? get collection; @override int? get initialIndex; - - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$WebSocketLoadEventDataPlaylistImplCopyWith< _$WebSocketLoadEventDataPlaylistImpl> get copyWith => throw _privateConstructorUsedError; @@ -472,8 +456,6 @@ class __$$WebSocketLoadEventDataAlbumImplCopyWithImpl<$Res> $Res Function(_$WebSocketLoadEventDataAlbumImpl) _then) : super(_value, _then); - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -497,8 +479,6 @@ class __$$WebSocketLoadEventDataAlbumImplCopyWithImpl<$Res> )); } - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $SpotubeSimpleAlbumObjectCopyWith<$Res>? get collection { @@ -565,14 +545,12 @@ class _$WebSocketLoadEventDataAlbumImpl extends WebSocketLoadEventDataAlbum { other.initialIndex == initialIndex)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, const DeepCollectionEquality().hash(_tracks), collection, initialIndex); - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$WebSocketLoadEventDataAlbumImplCopyWith<_$WebSocketLoadEventDataAlbumImpl> @@ -705,11 +683,8 @@ abstract class WebSocketLoadEventDataAlbum extends WebSocketLoadEventData { SpotubeSimpleAlbumObject? get collection; @override int? get initialIndex; - - /// Create a copy of WebSocketLoadEventData - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$WebSocketLoadEventDataAlbumImplCopyWith<_$WebSocketLoadEventDataAlbumImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/models/metadata/image.dart b/lib/models/metadata/image.dart index 0467dfd6..ae63af35 100644 --- a/lib/models/metadata/image.dart +++ b/lib/models/metadata/image.dart @@ -20,9 +20,9 @@ enum ImagePlaceholder { } final placeholderUrlMap = { - ImagePlaceholder.albumArt: Assets.albumPlaceholder.path, - ImagePlaceholder.artist: Assets.userPlaceholder.path, - ImagePlaceholder.collection: Assets.placeholder.path, + ImagePlaceholder.albumArt: Assets.images.albumPlaceholder.path, + ImagePlaceholder.artist: Assets.images.userPlaceholder.path, + ImagePlaceholder.collection: Assets.images.placeholder.path, ImagePlaceholder.online: "https://avatars.dicebear.com/api/bottts/${PrimitiveUtils.uuid.v4()}.png", }; diff --git a/lib/models/metadata/metadata.freezed.dart b/lib/models/metadata/metadata.freezed.dart index bb4cf3f8..54fd452a 100644 --- a/lib/models/metadata/metadata.freezed.dart +++ b/lib/models/metadata/metadata.freezed.dart @@ -33,12 +33,8 @@ mixin _$SpotubeFullAlbumObject { String? get recordLabel => throw _privateConstructorUsedError; List? get genres => throw _privateConstructorUsedError; - /// Serializes this SpotubeFullAlbumObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeFullAlbumObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeFullAlbumObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -73,8 +69,6 @@ class _$SpotubeFullAlbumObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeFullAlbumObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -166,8 +160,6 @@ class __$$SpotubeFullAlbumObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeFullAlbumObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeFullAlbumObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -316,7 +308,7 @@ class _$SpotubeFullAlbumObjectImpl implements _SpotubeFullAlbumObject { const DeepCollectionEquality().equals(other._genres, _genres)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -331,9 +323,7 @@ class _$SpotubeFullAlbumObjectImpl implements _SpotubeFullAlbumObject { recordLabel, const DeepCollectionEquality().hash(_genres)); - /// Create a copy of SpotubeFullAlbumObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeFullAlbumObjectImplCopyWith<_$SpotubeFullAlbumObjectImpl> @@ -384,11 +374,8 @@ abstract class _SpotubeFullAlbumObject implements SpotubeFullAlbumObject { String? get recordLabel; @override List? get genres; - - /// Create a copy of SpotubeFullAlbumObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeFullAlbumObjectImplCopyWith<_$SpotubeFullAlbumObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -409,12 +396,8 @@ mixin _$SpotubeSimpleAlbumObject { SpotubeAlbumType get albumType => throw _privateConstructorUsedError; String? get releaseDate => throw _privateConstructorUsedError; - /// Serializes this SpotubeSimpleAlbumObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeSimpleAlbumObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeSimpleAlbumObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -446,8 +429,6 @@ class _$SpotubeSimpleAlbumObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeSimpleAlbumObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -521,8 +502,6 @@ class __$$SpotubeSimpleAlbumObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeSimpleAlbumObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeSimpleAlbumObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -634,7 +613,7 @@ class _$SpotubeSimpleAlbumObjectImpl implements _SpotubeSimpleAlbumObject { other.releaseDate == releaseDate)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -646,9 +625,7 @@ class _$SpotubeSimpleAlbumObjectImpl implements _SpotubeSimpleAlbumObject { albumType, releaseDate); - /// Create a copy of SpotubeSimpleAlbumObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeSimpleAlbumObjectImplCopyWith<_$SpotubeSimpleAlbumObjectImpl> @@ -690,11 +667,8 @@ abstract class _SpotubeSimpleAlbumObject implements SpotubeSimpleAlbumObject { SpotubeAlbumType get albumType; @override String? get releaseDate; - - /// Create a copy of SpotubeSimpleAlbumObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeSimpleAlbumObjectImplCopyWith<_$SpotubeSimpleAlbumObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -713,12 +687,8 @@ mixin _$SpotubeFullArtistObject { List? get genres => throw _privateConstructorUsedError; int? get followers => throw _privateConstructorUsedError; - /// Serializes this SpotubeFullArtistObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeFullArtistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeFullArtistObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -749,8 +719,6 @@ class _$SpotubeFullArtistObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeFullArtistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -818,8 +786,6 @@ class __$$SpotubeFullArtistObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeFullArtistObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeFullArtistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -923,7 +889,7 @@ class _$SpotubeFullArtistObjectImpl implements _SpotubeFullArtistObject { other.followers == followers)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -934,9 +900,7 @@ class _$SpotubeFullArtistObjectImpl implements _SpotubeFullArtistObject { const DeepCollectionEquality().hash(_genres), followers); - /// Create a copy of SpotubeFullArtistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeFullArtistObjectImplCopyWith<_$SpotubeFullArtistObjectImpl> @@ -975,11 +939,8 @@ abstract class _SpotubeFullArtistObject implements SpotubeFullArtistObject { List? get genres; @override int? get followers; - - /// Create a copy of SpotubeFullArtistObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeFullArtistObjectImplCopyWith<_$SpotubeFullArtistObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -996,12 +957,8 @@ mixin _$SpotubeSimpleArtistObject { String get externalUri => throw _privateConstructorUsedError; List? get images => throw _privateConstructorUsedError; - /// Serializes this SpotubeSimpleArtistObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeSimpleArtistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeSimpleArtistObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -1030,8 +987,6 @@ class _$SpotubeSimpleArtistObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeSimpleArtistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1087,8 +1042,6 @@ class __$$SpotubeSimpleArtistObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeSimpleArtistObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeSimpleArtistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1164,14 +1117,12 @@ class _$SpotubeSimpleArtistObjectImpl implements _SpotubeSimpleArtistObject { const DeepCollectionEquality().equals(other._images, _images)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, id, name, externalUri, const DeepCollectionEquality().hash(_images)); - /// Create a copy of SpotubeSimpleArtistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeSimpleArtistObjectImplCopyWith<_$SpotubeSimpleArtistObjectImpl> @@ -1205,11 +1156,8 @@ abstract class _SpotubeSimpleArtistObject implements SpotubeSimpleArtistObject { String get externalUri; @override List? get images; - - /// Create a copy of SpotubeSimpleArtistObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeSimpleArtistObjectImplCopyWith<_$SpotubeSimpleArtistObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -1227,13 +1175,9 @@ mixin _$SpotubeBrowseSectionObject { bool get browseMore => throw _privateConstructorUsedError; List get items => throw _privateConstructorUsedError; - /// Serializes this SpotubeBrowseSectionObject to a JSON map. Map toJson(Object? Function(T) toJsonT) => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeBrowseSectionObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeBrowseSectionObjectCopyWith> get copyWith => throw _privateConstructorUsedError; } @@ -1265,8 +1209,6 @@ class _$SpotubeBrowseSectionObjectCopyWithImpl $Res Function(_$SpotubeBrowseSectionObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeBrowseSectionObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1415,14 +1355,12 @@ class _$SpotubeBrowseSectionObjectImpl const DeepCollectionEquality().equals(other._items, _items)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, id, title, externalUri, browseMore, const DeepCollectionEquality().hash(_items)); - /// Create a copy of SpotubeBrowseSectionObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeBrowseSectionObjectImplCopyWith bool get browseMore; @override List get items; - - /// Create a copy of SpotubeBrowseSectionObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeBrowseSectionObjectImplCopyWith> get copyWith => throw _privateConstructorUsedError; @@ -1551,13 +1486,8 @@ mixin _$MetadataFormFieldObject { required TResult orElse(), }) => throw _privateConstructorUsedError; - - /// Serializes this MetadataFormFieldObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $MetadataFormFieldObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -1582,8 +1512,6 @@ class _$MetadataFormFieldObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1627,8 +1555,6 @@ class __$$MetadataFormFieldInputObjectImplCopyWithImpl<$Res> $Res Function(_$MetadataFormFieldInputObjectImpl) _then) : super(_value, _then); - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1729,14 +1655,12 @@ class _$MetadataFormFieldInputObjectImpl (identical(other.regex, regex) || other.regex == regex)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, objectType, id, variant, placeholder, defaultValue, required, regex); - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$MetadataFormFieldInputObjectImplCopyWith< @@ -1862,11 +1786,8 @@ abstract class MetadataFormFieldInputObject implements MetadataFormFieldObject { String? get defaultValue; bool? get required; String? get regex; - - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$MetadataFormFieldInputObjectImplCopyWith< _$MetadataFormFieldInputObjectImpl> get copyWith => throw _privateConstructorUsedError; @@ -1894,8 +1815,6 @@ class __$$MetadataFormFieldTextObjectImplCopyWithImpl<$Res> $Res Function(_$MetadataFormFieldTextObjectImpl) _then) : super(_value, _then); - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -1945,13 +1864,11 @@ class _$MetadataFormFieldTextObjectImpl implements MetadataFormFieldTextObject { (identical(other.text, text) || other.text == text)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, objectType, text); - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$MetadataFormFieldTextObjectImplCopyWith<_$MetadataFormFieldTextObjectImpl> @@ -2063,11 +1980,8 @@ abstract class MetadataFormFieldTextObject implements MetadataFormFieldObject { @override String get objectType; String get text; - - /// Create a copy of MetadataFormFieldObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$MetadataFormFieldTextObjectImplCopyWith<_$MetadataFormFieldTextObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -2082,12 +1996,8 @@ mixin _$SpotubeImageObject { int? get width => throw _privateConstructorUsedError; int? get height => throw _privateConstructorUsedError; - /// Serializes this SpotubeImageObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeImageObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeImageObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -2111,8 +2021,6 @@ class _$SpotubeImageObjectCopyWithImpl<$Res, $Val extends SpotubeImageObject> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeImageObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -2156,8 +2064,6 @@ class __$$SpotubeImageObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeImageObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeImageObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -2212,13 +2118,11 @@ class _$SpotubeImageObjectImpl implements _SpotubeImageObject { (identical(other.height, height) || other.height == height)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, url, width, height); - /// Create a copy of SpotubeImageObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeImageObjectImplCopyWith<_$SpotubeImageObjectImpl> get copyWith => @@ -2248,11 +2152,8 @@ abstract class _SpotubeImageObject implements SpotubeImageObject { int? get width; @override int? get height; - - /// Create a copy of SpotubeImageObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeImageObjectImplCopyWith<_$SpotubeImageObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -2270,13 +2171,9 @@ mixin _$SpotubePaginationResponseObject { bool get hasMore => throw _privateConstructorUsedError; List get items => throw _privateConstructorUsedError; - /// Serializes this SpotubePaginationResponseObject to a JSON map. Map toJson(Object? Function(T) toJsonT) => throw _privateConstructorUsedError; - - /// Create a copy of SpotubePaginationResponseObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubePaginationResponseObjectCopyWith> get copyWith => throw _privateConstructorUsedError; @@ -2305,8 +2202,6 @@ class _$SpotubePaginationResponseObjectCopyWithImpl $Res Function(_$SpotubePaginationResponseObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubePaginationResponseObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -2450,14 +2343,12 @@ class _$SpotubePaginationResponseObjectImpl const DeepCollectionEquality().equals(other._items, _items)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, limit, nextOffset, total, hasMore, const DeepCollectionEquality().hash(_items)); - /// Create a copy of SpotubePaginationResponseObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubePaginationResponseObjectImplCopyWith bool get hasMore; @override List get items; - - /// Create a copy of SpotubePaginationResponseObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubePaginationResponseObjectImplCopyWith> get copyWith => throw _privateConstructorUsedError; @@ -2522,12 +2410,8 @@ mixin _$SpotubeFullPlaylistObject { bool get collaborative => throw _privateConstructorUsedError; bool get public => throw _privateConstructorUsedError; - /// Serializes this SpotubeFullPlaylistObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeFullPlaylistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeFullPlaylistObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -2563,8 +2447,6 @@ class _$SpotubeFullPlaylistObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeFullPlaylistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -2618,8 +2500,6 @@ class _$SpotubeFullPlaylistObjectCopyWithImpl<$Res, ) as $Val); } - /// Create a copy of SpotubeFullPlaylistObject - /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $SpotubeUserObjectCopyWith<$Res> get owner { @@ -2663,8 +2543,6 @@ class __$$SpotubeFullPlaylistObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeFullPlaylistObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeFullPlaylistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -2798,7 +2676,7 @@ class _$SpotubeFullPlaylistObjectImpl implements _SpotubeFullPlaylistObject { (identical(other.public, public) || other.public == public)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -2812,9 +2690,7 @@ class _$SpotubeFullPlaylistObjectImpl implements _SpotubeFullPlaylistObject { collaborative, public); - /// Create a copy of SpotubeFullPlaylistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeFullPlaylistObjectImplCopyWith<_$SpotubeFullPlaylistObjectImpl> @@ -2862,11 +2738,8 @@ abstract class _SpotubeFullPlaylistObject implements SpotubeFullPlaylistObject { bool get collaborative; @override bool get public; - - /// Create a copy of SpotubeFullPlaylistObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeFullPlaylistObjectImplCopyWith<_$SpotubeFullPlaylistObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -2885,12 +2758,8 @@ mixin _$SpotubeSimplePlaylistObject { SpotubeUserObject get owner => throw _privateConstructorUsedError; List get images => throw _privateConstructorUsedError; - /// Serializes this SpotubeSimplePlaylistObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeSimplePlaylistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeSimplePlaylistObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -2925,8 +2794,6 @@ class _$SpotubeSimplePlaylistObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeSimplePlaylistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -2965,8 +2832,6 @@ class _$SpotubeSimplePlaylistObjectCopyWithImpl<$Res, ) as $Val); } - /// Create a copy of SpotubeSimplePlaylistObject - /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $SpotubeUserObjectCopyWith<$Res> get owner { @@ -3007,8 +2872,6 @@ class __$$SpotubeSimplePlaylistObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeSimplePlaylistObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeSimplePlaylistObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -3104,14 +2967,12 @@ class _$SpotubeSimplePlaylistObjectImpl const DeepCollectionEquality().equals(other._images, _images)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, id, name, description, externalUri, owner, const DeepCollectionEquality().hash(_images)); - /// Create a copy of SpotubeSimplePlaylistObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeSimplePlaylistObjectImplCopyWith<_$SpotubeSimplePlaylistObjectImpl> @@ -3152,11 +3013,8 @@ abstract class _SpotubeSimplePlaylistObject SpotubeUserObject get owner; @override List get images; - - /// Create a copy of SpotubeSimplePlaylistObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeSimplePlaylistObjectImplCopyWith<_$SpotubeSimplePlaylistObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -3176,12 +3034,8 @@ mixin _$SpotubeSearchResponseObject { throw _privateConstructorUsedError; List get tracks => throw _privateConstructorUsedError; - /// Serializes this SpotubeSearchResponseObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeSearchResponseObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeSearchResponseObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -3212,8 +3066,6 @@ class _$SpotubeSearchResponseObjectCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeSearchResponseObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -3269,8 +3121,6 @@ class __$$SpotubeSearchResponseObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeSearchResponseObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeSearchResponseObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -3367,7 +3217,7 @@ class _$SpotubeSearchResponseObjectImpl const DeepCollectionEquality().equals(other._tracks, _tracks)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -3376,9 +3226,7 @@ class _$SpotubeSearchResponseObjectImpl const DeepCollectionEquality().hash(_playlists), const DeepCollectionEquality().hash(_tracks)); - /// Create a copy of SpotubeSearchResponseObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeSearchResponseObjectImplCopyWith<_$SpotubeSearchResponseObjectImpl> @@ -3413,11 +3261,8 @@ abstract class _SpotubeSearchResponseObject List get playlists; @override List get tracks; - - /// Create a copy of SpotubeSearchResponseObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeSearchResponseObjectImplCopyWith<_$SpotubeSearchResponseObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -3533,13 +3378,8 @@ mixin _$SpotubeTrackObject { required TResult orElse(), }) => throw _privateConstructorUsedError; - - /// Serializes this SpotubeTrackObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeTrackObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -3571,8 +3411,6 @@ class _$SpotubeTrackObjectCopyWithImpl<$Res, $Val extends SpotubeTrackObject> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -3611,8 +3449,6 @@ class _$SpotubeTrackObjectCopyWithImpl<$Res, $Val extends SpotubeTrackObject> ) as $Val); } - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. @override @pragma('vm:prefer-inline') $SpotubeSimpleAlbumObjectCopyWith<$Res> get album { @@ -3654,8 +3490,6 @@ class __$$SpotubeLocalTrackObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeLocalTrackObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -3764,14 +3598,12 @@ class _$SpotubeLocalTrackObjectImpl implements SpotubeLocalTrackObject { (identical(other.path, path) || other.path == path)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, id, name, externalUri, const DeepCollectionEquality().hash(_artists), album, durationMs, path); - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeLocalTrackObjectImplCopyWith<_$SpotubeLocalTrackObjectImpl> @@ -3925,11 +3757,8 @@ abstract class SpotubeLocalTrackObject implements SpotubeTrackObject { @override int get durationMs; String get path; - - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeLocalTrackObjectImplCopyWith<_$SpotubeLocalTrackObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -3966,8 +3795,6 @@ class __$$SpotubeFullTrackObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeFullTrackObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -4086,7 +3913,7 @@ class _$SpotubeFullTrackObjectImpl implements SpotubeFullTrackObject { other.explicit == explicit)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -4099,9 +3926,7 @@ class _$SpotubeFullTrackObjectImpl implements SpotubeFullTrackObject { isrc, explicit); - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeFullTrackObjectImplCopyWith<_$SpotubeFullTrackObjectImpl> @@ -4260,11 +4085,8 @@ abstract class SpotubeFullTrackObject implements SpotubeTrackObject { int get durationMs; String get isrc; bool get explicit; - - /// Create a copy of SpotubeTrackObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeFullTrackObjectImplCopyWith<_$SpotubeFullTrackObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -4280,12 +4102,8 @@ mixin _$SpotubeUserObject { List get images => throw _privateConstructorUsedError; String get externalUri => throw _privateConstructorUsedError; - /// Serializes this SpotubeUserObject to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SpotubeUserObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SpotubeUserObjectCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -4313,8 +4131,6 @@ class _$SpotubeUserObjectCopyWithImpl<$Res, $Val extends SpotubeUserObject> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SpotubeUserObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -4367,8 +4183,6 @@ class __$$SpotubeUserObjectImplCopyWithImpl<$Res> $Res Function(_$SpotubeUserObjectImpl) _then) : super(_value, _then); - /// Create a copy of SpotubeUserObject - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -4444,14 +4258,12 @@ class _$SpotubeUserObjectImpl implements _SpotubeUserObject { other.externalUri == externalUri)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, id, name, const DeepCollectionEquality().hash(_images), externalUri); - /// Create a copy of SpotubeUserObject - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SpotubeUserObjectImplCopyWith<_$SpotubeUserObjectImpl> get copyWith => @@ -4484,11 +4296,8 @@ abstract class _SpotubeUserObject implements SpotubeUserObject { List get images; @override String get externalUri; - - /// Create a copy of SpotubeUserObject - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SpotubeUserObjectImplCopyWith<_$SpotubeUserObjectImpl> get copyWith => throw _privateConstructorUsedError; } @@ -4510,12 +4319,8 @@ mixin _$PluginConfiguration { List get abilities => throw _privateConstructorUsedError; String? get repository => throw _privateConstructorUsedError; - /// Serializes this PluginConfiguration to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of PluginConfiguration - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $PluginConfigurationCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -4549,8 +4354,6 @@ class _$PluginConfigurationCopyWithImpl<$Res, $Val extends PluginConfiguration> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of PluginConfiguration - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -4639,8 +4442,6 @@ class __$$PluginConfigurationImplCopyWithImpl<$Res> $Res Function(_$PluginConfigurationImpl) _then) : super(_value, _then); - /// Create a copy of PluginConfiguration - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -4783,7 +4584,7 @@ class _$PluginConfigurationImpl extends _PluginConfiguration { other.repository == repository)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -4798,9 +4599,7 @@ class _$PluginConfigurationImpl extends _PluginConfiguration { const DeepCollectionEquality().hash(_abilities), repository); - /// Create a copy of PluginConfiguration - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$PluginConfigurationImplCopyWith<_$PluginConfigurationImpl> get copyWith => @@ -4852,11 +4651,8 @@ abstract class _PluginConfiguration extends PluginConfiguration { List get abilities; @override String? get repository; - - /// Create a copy of PluginConfiguration - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$PluginConfigurationImplCopyWith<_$PluginConfigurationImpl> get copyWith => throw _privateConstructorUsedError; } @@ -4872,12 +4668,8 @@ mixin _$PluginUpdateAvailable { String get version => throw _privateConstructorUsedError; String? get changelog => throw _privateConstructorUsedError; - /// Serializes this PluginUpdateAvailable to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of PluginUpdateAvailable - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $PluginUpdateAvailableCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -4902,8 +4694,6 @@ class _$PluginUpdateAvailableCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of PluginUpdateAvailable - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -4949,8 +4739,6 @@ class __$$PluginUpdateAvailableImplCopyWithImpl<$Res> $Res Function(_$PluginUpdateAvailableImpl) _then) : super(_value, _then); - /// Create a copy of PluginUpdateAvailable - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -5008,13 +4796,11 @@ class _$PluginUpdateAvailableImpl implements _PluginUpdateAvailable { other.changelog == changelog)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, downloadUrl, version, changelog); - /// Create a copy of PluginUpdateAvailable - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$PluginUpdateAvailableImplCopyWith<_$PluginUpdateAvailableImpl> @@ -5044,11 +4830,8 @@ abstract class _PluginUpdateAvailable implements PluginUpdateAvailable { String get version; @override String? get changelog; - - /// Create a copy of PluginUpdateAvailable - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$PluginUpdateAvailableImplCopyWith<_$PluginUpdateAvailableImpl> get copyWith => throw _privateConstructorUsedError; } @@ -5065,12 +4848,8 @@ mixin _$MetadataPluginRepository { String get description => throw _privateConstructorUsedError; String get repoUrl => throw _privateConstructorUsedError; - /// Serializes this MetadataPluginRepository to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of MetadataPluginRepository - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $MetadataPluginRepositoryCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -5095,8 +4874,6 @@ class _$MetadataPluginRepositoryCopyWithImpl<$Res, // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of MetadataPluginRepository - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -5148,8 +4925,6 @@ class __$$MetadataPluginRepositoryImplCopyWithImpl<$Res> $Res Function(_$MetadataPluginRepositoryImpl) _then) : super(_value, _then); - /// Create a copy of MetadataPluginRepository - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -5217,14 +4992,12 @@ class _$MetadataPluginRepositoryImpl implements _MetadataPluginRepository { (identical(other.repoUrl, repoUrl) || other.repoUrl == repoUrl)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, name, owner, description, repoUrl); - /// Create a copy of MetadataPluginRepository - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$MetadataPluginRepositoryImplCopyWith<_$MetadataPluginRepositoryImpl> @@ -5257,11 +5030,8 @@ abstract class _MetadataPluginRepository implements MetadataPluginRepository { String get description; @override String get repoUrl; - - /// Create a copy of MetadataPluginRepository - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$MetadataPluginRepositoryImplCopyWith<_$MetadataPluginRepositoryImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/models/playback/track_sources.freezed.dart b/lib/models/playback/track_sources.freezed.dart index 28130873..760037d8 100644 --- a/lib/models/playback/track_sources.freezed.dart +++ b/lib/models/playback/track_sources.freezed.dart @@ -28,12 +28,8 @@ mixin _$TrackSourceQuery { String get isrc => throw _privateConstructorUsedError; bool get explicit => throw _privateConstructorUsedError; - /// Serializes this TrackSourceQuery to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of TrackSourceQuery - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $TrackSourceQueryCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -64,8 +60,6 @@ class _$TrackSourceQueryCopyWithImpl<$Res, $Val extends TrackSourceQuery> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of TrackSourceQuery - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -136,8 +130,6 @@ class __$$TrackSourceQueryImplCopyWithImpl<$Res> $Res Function(_$TrackSourceQueryImpl) _then) : super(_value, _then); - /// Create a copy of TrackSourceQuery - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -241,7 +233,7 @@ class _$TrackSourceQueryImpl extends _TrackSourceQuery { other.explicit == explicit)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -253,9 +245,7 @@ class _$TrackSourceQueryImpl extends _TrackSourceQuery { isrc, explicit); - /// Create a copy of TrackSourceQuery - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$TrackSourceQueryImplCopyWith<_$TrackSourceQueryImpl> get copyWith => @@ -298,11 +288,8 @@ abstract class _TrackSourceQuery extends TrackSourceQuery { String get isrc; @override bool get explicit; - - /// Create a copy of TrackSourceQuery - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$TrackSourceQueryImplCopyWith<_$TrackSourceQueryImpl> get copyWith => throw _privateConstructorUsedError; } @@ -320,12 +307,8 @@ mixin _$TrackSourceInfo { String get pageUrl => throw _privateConstructorUsedError; int get durationMs => throw _privateConstructorUsedError; - /// Serializes this TrackSourceInfo to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of TrackSourceInfo - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $TrackSourceInfoCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -355,8 +338,6 @@ class _$TrackSourceInfoCopyWithImpl<$Res, $Val extends TrackSourceInfo> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of TrackSourceInfo - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -421,8 +402,6 @@ class __$$TrackSourceInfoImplCopyWithImpl<$Res> _$TrackSourceInfoImpl _value, $Res Function(_$TrackSourceInfoImpl) _then) : super(_value, _then); - /// Create a copy of TrackSourceInfo - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -509,14 +488,12 @@ class _$TrackSourceInfoImpl implements _TrackSourceInfo { other.durationMs == durationMs)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, id, title, artists, thumbnail, pageUrl, durationMs); - /// Create a copy of TrackSourceInfo - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$TrackSourceInfoImplCopyWith<_$TrackSourceInfoImpl> get copyWith => @@ -555,11 +532,8 @@ abstract class _TrackSourceInfo implements TrackSourceInfo { String get pageUrl; @override int get durationMs; - - /// Create a copy of TrackSourceInfo - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$TrackSourceInfoImplCopyWith<_$TrackSourceInfoImpl> get copyWith => throw _privateConstructorUsedError; } @@ -575,12 +549,8 @@ mixin _$TrackSource { SourceCodecs get codec => throw _privateConstructorUsedError; String get bitrate => throw _privateConstructorUsedError; - /// Serializes this TrackSource to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of TrackSource - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $TrackSourceCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -608,8 +578,6 @@ class _$TrackSourceCopyWithImpl<$Res, $Val extends TrackSource> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of TrackSource - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -662,8 +630,6 @@ class __$$TrackSourceImplCopyWithImpl<$Res> _$TrackSourceImpl _value, $Res Function(_$TrackSourceImpl) _then) : super(_value, _then); - /// Create a copy of TrackSource - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -730,13 +696,11 @@ class _$TrackSourceImpl implements _TrackSource { (identical(other.bitrate, bitrate) || other.bitrate == bitrate)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, url, quality, codec, bitrate); - /// Create a copy of TrackSource - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$TrackSourceImplCopyWith<_$TrackSourceImpl> get copyWith => @@ -768,11 +732,8 @@ abstract class _TrackSource implements TrackSource { SourceCodecs get codec; @override String get bitrate; - - /// Create a copy of TrackSource - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$TrackSourceImplCopyWith<_$TrackSourceImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/modules/player/player.dart b/lib/modules/player/player.dart index f96c52df..614ac295 100644 --- a/lib/modules/player/player.dart +++ b/lib/modules/player/player.dart @@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer; +import 'package:shadcn_flutter/shadcn_flutter.dart'; import 'package:sliding_up_panel/sliding_up_panel.dart'; import 'package:spotube/collections/assets.gen.dart'; @@ -115,7 +115,7 @@ class PlayerView extends HookConsumerWidget { trailing: [ if (currentActiveTrackSource is YoutubeSourcedTrack) TextButton( - leading: Assets.logos.songlinkTransparent.image( + leading: Assets.images.logos.songlinkTransparent.image( width: 20, height: 20, color: theme.colorScheme.foreground, @@ -178,7 +178,7 @@ class PlayerView extends HookConsumerWidget { borderRadius: BorderRadius.circular(20), child: UniversalImage( path: albumArt, - placeholder: Assets.albumPlaceholder.path, + placeholder: Assets.images.albumPlaceholder.path, fit: BoxFit.cover, ), ), diff --git a/lib/modules/player/player_track_details.dart b/lib/modules/player/player_track_details.dart index 995ed4ab..9e436e60 100644 --- a/lib/modules/player/player_track_details.dart +++ b/lib/modules/player/player_track_details.dart @@ -37,7 +37,7 @@ class PlayerTrackDetails extends HookConsumerWidget { child: UniversalImage( path: (track?.album.images) .asUrlString(placeholder: ImagePlaceholder.albumArt), - placeholder: Assets.albumPlaceholder.path, + placeholder: Assets.images.albumPlaceholder.path, ), ), ), diff --git a/lib/modules/player/sibling_tracks_sheet.dart b/lib/modules/player/sibling_tracks_sheet.dart index 4e36aa09..a1a87dfc 100644 --- a/lib/modules/player/sibling_tracks_sheet.dart +++ b/lib/modules/player/sibling_tracks_sheet.dart @@ -36,7 +36,7 @@ final sourceInfoToIconMap = { decoration: BoxDecoration( borderRadius: BorderRadius.circular(90), image: DecorationImage( - image: Assets.jiosaavn.provider(), + image: Assets.images.logos.jiosaavn.provider(), fit: BoxFit.cover, ), ), @@ -48,7 +48,7 @@ final sourceInfoToIconMap = { decoration: BoxDecoration( borderRadius: BorderRadius.circular(90), image: DecorationImage( - image: Assets.invidious.provider(), + image: Assets.images.logos.invidious.provider(), fit: BoxFit.cover, ), ), diff --git a/lib/modules/root/bottom_player.dart b/lib/modules/root/bottom_player.dart index 5d9fd35b..33497d8d 100644 --- a/lib/modules/root/bottom_player.dart +++ b/lib/modules/root/bottom_player.dart @@ -40,7 +40,7 @@ class BottomPlayer extends HookConsumerWidget { index: (playlist.activeTrack?.album.images.length ?? 1) - 1, placeholder: ImagePlaceholder.albumArt, ) - : Assets.albumPlaceholder.path, + : Assets.images.albumPlaceholder.path, [playlist.activeTrack?.album.images], ); diff --git a/lib/modules/root/sidebar/sidebar.dart b/lib/modules/root/sidebar/sidebar.dart index 62571581..65c91527 100644 --- a/lib/modules/root/sidebar/sidebar.dart +++ b/lib/modules/root/sidebar/sidebar.dart @@ -26,7 +26,7 @@ class Sidebar extends HookConsumerWidget { color: Colors.black, borderRadius: BorderRadius.circular(50), ), - child: Assets.spotubeLogoPng.image( + child: Assets.branding.spotubeLogo.image( height: 50, cacheHeight: (100 * MediaQuery.devicePixelRatioOf(context)).toInt(), ), diff --git a/lib/pages/getting_started/getting_started.dart b/lib/pages/getting_started/getting_started.dart index a576ed09..1662624c 100644 --- a/lib/pages/getting_started/getting_started.dart +++ b/lib/pages/getting_started/getting_started.dart @@ -71,7 +71,7 @@ class GettingStartedPage extends HookConsumerWidget { child: DecoratedBox( decoration: BoxDecoration( image: DecorationImage( - image: Assets.bengaliPatternsBg.provider(), + image: Assets.images.bengaliPatternsBg.provider(), fit: BoxFit.cover, ), ), diff --git a/lib/pages/getting_started/sections/greeting.dart b/lib/pages/getting_started/sections/greeting.dart index 4b9c0a89..a65ade77 100644 --- a/lib/pages/getting_started/sections/greeting.dart +++ b/lib/pages/getting_started/sections/greeting.dart @@ -17,7 +17,7 @@ class GettingStartedPageGreetingSection extends HookConsumerWidget { child: Column( mainAxisSize: MainAxisSize.min, children: [ - Assets.spotubeLogoPng.image(height: 200), + Assets.branding.spotubeLogo.image(height: 200), const Gap(24), const Text("Spotube").semiBold().h4(), const Gap(4), diff --git a/lib/pages/getting_started/sections/playback.dart b/lib/pages/getting_started/sections/playback.dart index f122dbcd..43ff2c8e 100644 --- a/lib/pages/getting_started/sections/playback.dart +++ b/lib/pages/getting_started/sections/playback.dart @@ -19,9 +19,10 @@ final audioSourceToIconMap = { AudioSource.piped: const Icon(SpotubeIcons.piped, size: 20), AudioSource.invidious: ClipRRect( borderRadius: BorderRadius.circular(26), - child: Assets.invidious.image(width: 26, height: 26), + child: Assets.images.logos.invidious.image(width: 26, height: 26), ), - AudioSource.jiosaavn: Assets.jiosaavn.image(width: 20, height: 20), + AudioSource.jiosaavn: + Assets.images.logos.jiosaavn.image(width: 20, height: 20), }; class GettingStartedPagePlaybackSection extends HookConsumerWidget { diff --git a/lib/pages/home/home.dart b/lib/pages/home/home.dart index 89f12f45..faf46b3a 100644 --- a/lib/pages/home/home.dart +++ b/lib/pages/home/home.dart @@ -1,5 +1,3 @@ -import 'dart:ui'; - import 'package:auto_route/auto_route.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; @@ -47,8 +45,8 @@ class HomePage extends HookConsumerWidget { floating: true, title: Image.asset( theme.brightness == Brightness.dark - ? Assets.spotubeLogoPng.path - : Assets.spotubeLogoLight.path, + ? Assets.branding.spotubeLogo.path + : Assets.branding.spotubeLogoLight.path, height: 45, width: 45, color: theme.colorScheme.background, diff --git a/lib/pages/library/user_playlists.dart b/lib/pages/library/user_playlists.dart index 3e80801f..9020d463 100644 --- a/lib/pages/library/user_playlists.dart +++ b/lib/pages/library/user_playlists.dart @@ -50,7 +50,7 @@ class UserPlaylistsPage extends HookConsumerWidget { owner: me.asData!.value!, images: [ SpotubeImageObject( - url: Assets.likedTracks.path, + url: Assets.images.likedTracks.path, width: 300, height: 300, ) diff --git a/lib/pages/playlist/liked_playlist.dart b/lib/pages/playlist/liked_playlist.dart index 7c9a7fec..d840d9d0 100644 --- a/lib/pages/playlist/liked_playlist.dart +++ b/lib/pages/playlist/liked_playlist.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart' as material; import 'package:flutter/widgets.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:spotube/collections/assets.gen.dart'; import 'package:spotube/components/track_presentation/presentation_props.dart'; import 'package:spotube/components/track_presentation/track_presentation.dart'; import 'package:spotube/models/metadata/metadata.dart'; @@ -30,7 +31,7 @@ class LikedPlaylistPage extends HookConsumerWidget { child: TrackPresentation( options: TrackPresentationOptions( collection: playlist, - image: "assets/liked-tracks.jpg", + image: Assets.images.likedTracks.path, pagination: PaginationProps( hasNextPage: false, isLoading: likedTracks.isLoading, diff --git a/lib/pages/settings/about.dart b/lib/pages/settings/about.dart index 27775f3c..12e7ba44 100644 --- a/lib/pages/settings/about.dart +++ b/lib/pages/settings/about.dart @@ -45,7 +45,7 @@ class AboutSpotubePage extends HookConsumerWidget { padding: const EdgeInsets.symmetric(horizontal: 16.0), child: Column( children: [ - Assets.spotubeLogoPng.image( + Assets.branding.spotubeLogo.image( height: 200, width: 200, ), diff --git a/lib/provider/audio_player/state.freezed.dart b/lib/provider/audio_player/state.freezed.dart index 0299cd2f..146b0541 100644 --- a/lib/provider/audio_player/state.freezed.dart +++ b/lib/provider/audio_player/state.freezed.dart @@ -27,12 +27,8 @@ mixin _$AudioPlayerState { int get currentIndex => throw _privateConstructorUsedError; List get tracks => throw _privateConstructorUsedError; - /// Serializes this AudioPlayerState to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of AudioPlayerState - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $AudioPlayerStateCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -62,8 +58,6 @@ class _$AudioPlayerStateCopyWithImpl<$Res, $Val extends AudioPlayerState> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of AudioPlayerState - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -128,8 +122,6 @@ class __$$AudioPlayerStateImplCopyWithImpl<$Res> $Res Function(_$AudioPlayerStateImpl) _then) : super(_value, _then); - /// Create a copy of AudioPlayerState - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -234,7 +226,7 @@ class _$AudioPlayerStateImpl extends _AudioPlayerState { const DeepCollectionEquality().equals(other._tracks, _tracks)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash( runtimeType, @@ -245,9 +237,7 @@ class _$AudioPlayerStateImpl extends _AudioPlayerState { currentIndex, const DeepCollectionEquality().hash(_tracks)); - /// Create a copy of AudioPlayerState - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$AudioPlayerStateImplCopyWith<_$AudioPlayerStateImpl> get copyWith => @@ -287,11 +277,8 @@ abstract class _AudioPlayerState extends AudioPlayerState { int get currentIndex; @override List get tracks; - - /// Create a copy of AudioPlayerState - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$AudioPlayerStateImplCopyWith<_$AudioPlayerStateImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/lib/provider/tray_manager/tray_manager.dart b/lib/provider/tray_manager/tray_manager.dart index 9cc4becc..a976b09b 100644 --- a/lib/provider/tray_manager/tray_manager.dart +++ b/lib/provider/tray_manager/tray_manager.dart @@ -22,10 +22,10 @@ class SystemTrayManager with TrayListener { if (enabled) { await trayManager.setIcon( kIsWindows - ? 'assets/spotube-logo.ico' + ? 'assets/branding/spotube-logo.ico' : kIsFlatpak ? 'com.github.KRTirtho.Spotube' - : 'assets/spotube-logo.png', + : 'assets/branding/spotube-logo.png', ); trayManager.addListener(this); } else { diff --git a/lib/services/song_link/song_link.freezed.dart b/lib/services/song_link/song_link.freezed.dart index c704cde3..0a1af8a9 100644 --- a/lib/services/song_link/song_link.freezed.dart +++ b/lib/services/song_link/song_link.freezed.dart @@ -30,12 +30,8 @@ mixin _$SongLink { String? get nativeAppUriMobile => throw _privateConstructorUsedError; String? get nativeAppUriDesktop => throw _privateConstructorUsedError; - /// Serializes this SongLink to a JSON map. Map toJson() => throw _privateConstructorUsedError; - - /// Create a copy of SongLink - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) $SongLinkCopyWith get copyWith => throw _privateConstructorUsedError; } @@ -67,8 +63,6 @@ class _$SongLinkCopyWithImpl<$Res, $Val extends SongLink> // ignore: unused_field final $Res Function($Val) _then; - /// Create a copy of SongLink - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -151,8 +145,6 @@ class __$$SongLinkImplCopyWithImpl<$Res> _$SongLinkImpl _value, $Res Function(_$SongLinkImpl) _then) : super(_value, _then); - /// Create a copy of SongLink - /// with the given fields replaced by the non-null parameter values. @pragma('vm:prefer-inline') @override $Res call({ @@ -269,14 +261,12 @@ class _$SongLinkImpl implements _SongLink { other.nativeAppUriDesktop == nativeAppUriDesktop)); } - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override int get hashCode => Object.hash(runtimeType, displayName, linkId, platform, show, uniqueId, country, url, nativeAppUriMobile, nativeAppUriDesktop); - /// Create a copy of SongLink - /// with the given fields replaced by the non-null parameter values. - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) @override @pragma('vm:prefer-inline') _$$SongLinkImplCopyWith<_$SongLinkImpl> get copyWith => @@ -323,11 +313,8 @@ abstract class _SongLink implements SongLink { String? get nativeAppUriMobile; @override String? get nativeAppUriDesktop; - - /// Create a copy of SongLink - /// with the given fields replaced by the non-null parameter values. @override - @JsonKey(includeFromJson: false, includeToJson: false) + @JsonKey(ignore: true) _$$SongLinkImplCopyWith<_$SongLinkImpl> get copyWith => throw _privateConstructorUsedError; } diff --git a/linux/com.github.KRTirtho.Spotube.appdata.xml b/linux/com.github.KRTirtho.Spotube.appdata.xml index ad63e4b0..d8024303 100644 --- a/linux/com.github.KRTirtho.Spotube.appdata.xml +++ b/linux/com.github.KRTirtho.Spotube.appdata.xml @@ -37,7 +37,7 @@ - https://rawcdn.githack.com/KRTirtho/spotube/refs/heads/master/assets/spotube-screenshot.png + https://rawcdn.githack.com/KRTirtho/spotube/refs/heads/master/assets/branding/spotube-screenshot.png Spotube screenshot diff --git a/linux/packaging/appimage/make_config.yaml b/linux/packaging/appimage/make_config.yaml index a877028c..b277e20e 100644 --- a/linux/packaging/appimage/make_config.yaml +++ b/linux/packaging/appimage/make_config.yaml @@ -1,5 +1,5 @@ display_name: Spotube -icon: assets/spotube-logo.png +icon: assets/branding/spotube-logo.png keywords: - Music diff --git a/linux/packaging/deb/make_config.yaml b/linux/packaging/deb/make_config.yaml index 12e57e1c..ba5e4665 100644 --- a/linux/packaging/deb/make_config.yaml +++ b/linux/packaging/deb/make_config.yaml @@ -30,7 +30,7 @@ suggested_dependencies: - yt-dlp essential: false -icon: assets/spotube-logo.png +icon: assets/branding/spotube-logo.png keywords: - Music diff --git a/linux/packaging/rpm/make_config.yaml b/linux/packaging/rpm/make_config.yaml index e709642e..510aedc7 100644 --- a/linux/packaging/rpm/make_config.yaml +++ b/linux/packaging/rpm/make_config.yaml @@ -1,4 +1,4 @@ -icon: assets/spotube-logo.png +icon: assets/branding/spotube-logo.png summary: Lightweight cross-platform music client group: Applications/Multimedia vendor: Kingkor Roy Tirtho diff --git a/macos/packaging/dmg/make_config.yaml b/macos/packaging/dmg/make_config.yaml index 8292ede1..74e58066 100644 --- a/macos/packaging/dmg/make_config.yaml +++ b/macos/packaging/dmg/make_config.yaml @@ -1,5 +1,5 @@ title: Spotube -icon: assets/spotube-logo.png +icon: assets/branding/spotube-logo.png contents: - x: 448 y: 344 diff --git a/pubspec.yaml b/pubspec.yaml index 2192b70a..8d9d700b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -199,11 +199,10 @@ flutter: generate: true uses-material-design: true assets: - - assets/ - - assets/tutorial/ - - assets/logos/ - - assets/backgrounds/ - - assets/patterns/ + - assets/images/ + - assets/images/logos/ + - assets/branding/spotube-logo.png + - assets/branding/spotube-logo-light.png - LICENSE - packages/flutter_undraw/assets/undraw/access_denied.svg - packages/flutter_undraw/assets/undraw/fixing_bugs.svg diff --git a/windows/packaging/exe/inno_setup.iss b/windows/packaging/exe/inno_setup.iss index 976da962..15ffec05 100644 --- a/windows/packaging/exe/inno_setup.iss +++ b/windows/packaging/exe/inno_setup.iss @@ -20,7 +20,7 @@ Compression=lzma SolidCompression=yes SetupIconFile={{SETUP_ICON_FILE}} WizardStyle=modern -WizardSmallImageFile="..\\..\\assets\\spotube-logo.bmp" +WizardSmallImageFile="..\\..\\assets\\branding\\spotube-logo.bmp" PrivilegesRequired={{PRIVILEGES_REQUIRED}} ArchitecturesAllowed=x64compatible ArchitecturesInstallIn64BitMode=x64compatible