Merge branch 'dev' into master

KeptCodes · Dec 2, 2024 · d53b72b · d53b72b
2 parents 8ef45b3 + c546182
commit d53b72b
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 97 deletions.
diff --git a/lib/core/utils.dart b/lib/core/utils.dart
@@ -47,7 +47,7 @@ List<TrendClass> 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<TrendClass> 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<TrendClass> 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<TrendClass> 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
@@ -36,7 +36,7 @@ class AlbumController extends StateNotifier<bool> {
     );
 
     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
@@ -35,7 +35,7 @@ class ArtistController extends StateNotifier<bool> {
     );
 
     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
@@ -36,7 +36,7 @@ class ChartController extends StateNotifier<bool> {
     );
 
     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
@@ -181,10 +181,10 @@ class PlayerController extends StateNotifier<bool> {
       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
@@ -36,7 +36,7 @@ class PlaylistController extends StateNotifier<bool> {
     );
 
     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
@@ -40,8 +40,8 @@ class _SearchViewState extends ConsumerState<SearchView> {
           builder: (context, controller) {
             return SearchBar(
               controller: controller,
-              backgroundColor: MaterialStateProperty.all(Colors.transparent),
-              padding: const MaterialStatePropertyAll<EdgeInsets>(
+              backgroundColor: WidgetStateProperty.all(Colors.transparent),
+              padding: const WidgetStatePropertyAll<EdgeInsets>(
                   EdgeInsets.symmetric(horizontal: 16.0)),
               onTap: () {
                 controller.openView();
@@ -173,7 +173,7 @@ class _SearchViewState extends ConsumerState<SearchView> {
                                 .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<SearchView> {
                                 .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<SearchView> {
                                 .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
@@ -34,7 +34,7 @@ class SongController extends StateNotifier<bool> {
     );
 
     final s = song.copyWith(
-      accentColor: accentColor.background,
+      accentColor: accentColor.surface,
     );
 
     return s;