diff --git a/lib/core/utils.dart b/lib/core/utils.dart index 37a9c87..9ce8566 100644 --- a/lib/core/utils.dart +++ b/lib/core/utils.dart @@ -47,7 +47,7 @@ List mergeAllMediaForSearch(SearchTopQueryModel data) { type: album.type, image: album.images[1].url, title: album.title, - subtitle: album.description, + subtitle: album.subtitle ?? "", badgeIcon: Icons.album_rounded, explicitContent: album.explicitContent, position: 0, @@ -59,10 +59,10 @@ List mergeAllMediaForSearch(SearchTopQueryModel data) { type: song.type, image: song.images[1].url, title: song.title, - subtitle: song.description, + subtitle: song.subtitle, badgeIcon: Icons.music_note_rounded, explicitContent: song.explicitContent, - position: song.ctr, + position: 0, ), ), ...data.playlists.map( @@ -71,7 +71,7 @@ List mergeAllMediaForSearch(SearchTopQueryModel data) { type: playlist.type, image: playlist.images[1].url, title: playlist.title, - subtitle: playlist.description, + subtitle: playlist.subtitle, badgeIcon: Icons.playlist_play_rounded, explicitContent: playlist.explicitContent, position: 0, @@ -83,10 +83,10 @@ List mergeAllMediaForSearch(SearchTopQueryModel data) { type: artist.type, image: artist.images[1].url, title: artist.title, - subtitle: artist.description, + subtitle: "", badgeIcon: Icons.mic_external_on_rounded, explicitContent: false, - position: artist.position, + position: 0, ), ), ]; diff --git a/lib/functions/album/controllers/album_controller.dart b/lib/functions/album/controllers/album_controller.dart index f2f7c31..9966668 100644 --- a/lib/functions/album/controllers/album_controller.dart +++ b/lib/functions/album/controllers/album_controller.dart @@ -36,7 +36,7 @@ class AlbumController extends StateNotifier { ); final s = album.copyWith( - accentColor: accentColor.background, + accentColor: accentColor.surface, ); return s; diff --git a/lib/functions/artist/controller/artist_controller.dart b/lib/functions/artist/controller/artist_controller.dart index 97b11c4..280e292 100644 --- a/lib/functions/artist/controller/artist_controller.dart +++ b/lib/functions/artist/controller/artist_controller.dart @@ -35,7 +35,7 @@ class ArtistController extends StateNotifier { ); final s = artist.copyWith( - accentColor: accentColor.background, + accentColor: accentColor.surface, ); return s; diff --git a/lib/functions/charts/controllers/charts_controller.dart b/lib/functions/charts/controllers/charts_controller.dart index 7740ea2..5295558 100644 --- a/lib/functions/charts/controllers/charts_controller.dart +++ b/lib/functions/charts/controllers/charts_controller.dart @@ -36,7 +36,7 @@ class ChartController extends StateNotifier { ); final s = chart.copyWith( - accentColor: accentColor.background, + accentColor: accentColor.surface, ); return s; diff --git a/lib/functions/player/controllers/player_controller.dart b/lib/functions/player/controllers/player_controller.dart index 92ed9b3..27dca0f 100644 --- a/lib/functions/player/controllers/player_controller.dart +++ b/lib/functions/player/controllers/player_controller.dart @@ -181,10 +181,10 @@ class PlayerController extends StateNotifier { FlutterDiscordRPC.instance.setActivity( activity: RPCActivity( activityType: ActivityType.listening, - state: "${song.title} Playing Now", + state: "${song.title} - ${song.albumName}", assets: RPCAssets( largeImage: song.images[2].url, - smallText: "${song.title} - ${song.albumName}", + smallText: "${song.title} Playing Now", ), details: "Playing ${song.title} by ${song.artists[0].name} on Sangeet.", diff --git a/lib/functions/playlist/controllers/playlist_controller.dart b/lib/functions/playlist/controllers/playlist_controller.dart index 87a4a85..8c60927 100644 --- a/lib/functions/playlist/controllers/playlist_controller.dart +++ b/lib/functions/playlist/controllers/playlist_controller.dart @@ -36,7 +36,7 @@ class PlaylistController extends StateNotifier { ); final s = playlist.copyWith( - accentColor: accentColor.background, + accentColor: accentColor.surface, ); return s; diff --git a/lib/functions/search/views/search_view.dart b/lib/functions/search/views/search_view.dart index 23d098f..609bff6 100644 --- a/lib/functions/search/views/search_view.dart +++ b/lib/functions/search/views/search_view.dart @@ -40,8 +40,8 @@ class _SearchViewState extends ConsumerState { builder: (context, controller) { return SearchBar( controller: controller, - backgroundColor: MaterialStateProperty.all(Colors.transparent), - padding: const MaterialStatePropertyAll( + backgroundColor: WidgetStateProperty.all(Colors.transparent), + padding: const WidgetStatePropertyAll( EdgeInsets.symmetric(horizontal: 16.0)), onTap: () { controller.openView(); @@ -173,7 +173,7 @@ class _SearchViewState extends ConsumerState { .push(AlbumView.route(item.id)), image: item.images[1].url, title: item.title, - subtitle: item.description, + subtitle: item.subtitle ?? "", explicitContent: item.explicitContent, badgeIcon: Icons.album_rounded, showMenu: false, @@ -196,7 +196,7 @@ class _SearchViewState extends ConsumerState { .push(ArtistView.route(item.id)), image: item.images[1].url, title: item.title, - subtitle: item.description, + subtitle: "", explicitContent: false, badgeIcon: Icons.mic_external_on_rounded, showMenu: false, @@ -219,7 +219,7 @@ class _SearchViewState extends ConsumerState { .push(PlaylistView.route(item.id)), image: item.images[1].url, title: item.title, - subtitle: item.description, + subtitle: item.subtitle, explicitContent: item.explicitContent, badgeIcon: Icons.album_rounded, showMenu: false, diff --git a/lib/functions/song/controllers/song_controller.dart b/lib/functions/song/controllers/song_controller.dart index b268453..916b781 100644 --- a/lib/functions/song/controllers/song_controller.dart +++ b/lib/functions/song/controllers/song_controller.dart @@ -34,7 +34,7 @@ class SongController extends StateNotifier { ); final s = song.copyWith( - accentColor: accentColor.background, + accentColor: accentColor.surface, ); return s; diff --git a/pubspec.lock b/pubspec.lock index cde7a0d..56f91d6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: transitive description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: audio_session - sha256: "4012d798e25a0ebfd4ad7203fefe7e386fdfedd2243afc52fa700b8bde6a3a4f" + sha256: "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261" url: "https://pub.dev" source: hosted - version: "0.1.20" + version: "0.1.21" audio_video_progress_bar: dependency: "direct main" description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: cli_util - sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 + sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.4.2" clock: dependency: transitive description: @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: @@ -157,18 +157,18 @@ packages: dependency: transitive description: name: dio - sha256: e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714 + sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260" url: "https://pub.dev" source: hosted - version: "5.5.0+1" + version: "5.7.0" dio_web_adapter: dependency: transitive description: name: dio_web_adapter - sha256: "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac" + sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" fake_async: dependency: transitive description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" file: dependency: transitive description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -226,10 +226,10 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: a77f77806a790eb9ba0118a5a3a936e81c4fea2b61533033b2b0c3d50bbde5ea + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.4.0" + version: "3.4.1" flutter_discord_rpc: dependency: "direct main" description: @@ -263,10 +263,10 @@ packages: dependency: "direct main" description: name: flutter_riverpod - sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" flutter_rust_bridge: dependency: transitive description: @@ -358,10 +358,10 @@ packages: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" http_parser: dependency: transitive description: @@ -374,10 +374,10 @@ packages: dependency: transitive description: name: image - sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" + sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.3.0" integration_test: dependency: "direct dev" description: flutter @@ -411,10 +411,10 @@ packages: dependency: "direct main" description: name: just_audio - sha256: ee50602364ba83fa6308f5512dd560c713ec3e1f2bc75f0db43618f0d82ef71a + sha256: a49e7120b95600bd357f37a2bb04cd1e88252f7cdea8f3368803779b925b1049 url: "https://pub.dev" source: hosted - version: "0.9.39" + version: "0.9.42" just_audio_media_kit: dependency: "direct main" description: @@ -435,10 +435,10 @@ packages: dependency: transitive description: name: just_audio_web - sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c" + sha256: "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448" url: "https://pub.dev" source: hosted - version: "0.4.11" + version: "0.4.13" just_audio_windows: dependency: "direct main" description: @@ -491,10 +491,10 @@ packages: dependency: transitive description: name: macos_window_utils - sha256: "230be594d26f6dee92c5a1544f4242d25138a5bfb9f185b27f14de3949ef0be8" + sha256: "3d3982495376077f23556b1e235faab3c6d478fe1238766f824e920708d60eba" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.6.0" matcher: dependency: transitive description: @@ -555,18 +555,18 @@ packages: dependency: "direct main" description: name: path_provider - sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.12" path_provider_foundation: dependency: transitive description: @@ -643,10 +643,10 @@ packages: dependency: transitive description: name: riverpod - sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" rxdart: dependency: "direct main" description: @@ -668,7 +668,7 @@ packages: description: path: "." ref: main - resolved-ref: de70e11db865efaad530f25408cf612db73ec2c0 + resolved-ref: "3e1d5ce0aab8de462a4511b64ededf5ed9540d95" url: "https://github.com/priyanshuverma-dev/sangeet-api" source: git version: "0.1.3" @@ -684,58 +684,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shortid: dependency: transitive description: @@ -748,10 +748,10 @@ packages: dependency: "direct main" description: name: skeletonizer - sha256: d94ae24d9fcedc5fd2984ccbe5af5e9d76e2bf6a35ee775fe8c737c90297908e + sha256: "3b202e4fa9c49b017d368fb0e570d4952bcd19972b67b2face071bdd68abbfae" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.2" sky_engine: dependency: transitive description: flutter @@ -889,10 +889,10 @@ packages: dependency: "direct main" description: name: tray_manager - sha256: c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64 + sha256: bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7 url: "https://pub.dev" source: hosted - version: "0.2.3" + version: "0.2.4" tripledes_nullsafety: dependency: transitive description: @@ -905,10 +905,10 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uni_platform: dependency: transitive description: @@ -937,18 +937,18 @@ packages: dependency: transitive description: name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603" url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.3.1" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" + sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "6.3.14" url_launcher_ios: dependency: transitive description: @@ -961,18 +961,18 @@ packages: dependency: transitive description: name: url_launcher_linux - sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_platform_interface: dependency: transitive description: @@ -985,26 +985,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 + sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.3" uuid: dependency: transitive description: name: uuid - sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90" + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.4.2" + version: "4.5.1" vector_math: dependency: transitive description: @@ -1025,10 +1025,10 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" webdriver: dependency: transitive description: @@ -1049,18 +1049,18 @@ packages: dependency: "direct main" description: name: windows_notification - sha256: "963482b068a9fc792832cf229f66953d4426ad4a46a99e03a26cd17313c3b2bf" + sha256: be3e650874615f315402c9b9f3656e29af156709c4b5cc272cb4ca0ab7ba94a8 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.1.0" xml: dependency: transitive description: