Redesign the Menu (#434)

* Fix flutter_downloader dependency * Fix dowloadCallback * Redesign the Song Item Menu * Remove useless TODO * Fix imageprovider in _SongInfo * Fixed the backwards * Add menu for player * try to fix the conflicts * Fix loading of background in menu * Move stuff about, get dynamic colour header working * Use dominant colour directly * Fixed Merge conflicts * Fix pubspec * fix merge & build * adapt to flutter_downloader API changes * remove scroll indicator - looks like a button, overlays menu items and looks a bit out of place - if people have trouble figuring out that the sheet can be scrolled, maybe an actual scrollbar like in the queue would help * improve theming of song menu - added blurred album cover to menu - updated colors - updated layout * minor design tweaks * added playback control buttons on player screen menu * make favorite state consistent * add additional buttons (go to artist/genre) * formatting --------- Co-authored-by: Yonggan <[email protected]> Co-authored-by: James Harvey <[email protected]> Co-authored-by: Chaphasilor <[email protected]>
jmshrv · Dec 20, 2023 · 03d39af · 03d39af
1 parent 82628e7
commit 03d39af
Show file tree

Hide file tree

Showing 22 changed files with 1,124 additions and 373 deletions.
diff --git a/.flutter b/.flutter
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -143,7 +143,7 @@ SPEC CHECKSUMS:
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   CropViewController: 58fb440f30dac788b129d2a1f24cffdcb102669c
-  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
+  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
   DKCamera: a902b66921fca14b7a75266feb8c7568aa7caa71
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179

diff --git a/lib/components/AlbumScreen/album_screen_content.dart b/lib/components/AlbumScreen/album_screen_content.dart
@@ -102,15 +102,15 @@ class _AlbumScreenContentState extends State<AlbumScreenContent> {
                   childrenForList: childrenOfThisDisc,
                   childrenForQueue: widget.children,
                   parent: widget.parent,
-                  onDelete: onDelete,
+                  onRemoveFromList: onDelete,
                 ),
               )
           else if (widget.children.isNotEmpty)
             SongsSliverList(
               childrenForList: widget.children,
               childrenForQueue: widget.children,
               parent: widget.parent,
-              onDelete: onDelete,
+              onRemoveFromList: onDelete,
             ),
         ],
       ),
@@ -124,14 +124,14 @@ class SongsSliverList extends StatefulWidget {
     required this.childrenForList,
     required this.childrenForQueue,
     required this.parent,
+    this.onRemoveFromList,
     this.showPlayCount = false,
-    this.onDelete,
   }) : super(key: key);
 
   final List<BaseItemDto> childrenForList;
   final List<BaseItemDto> childrenForQueue;
   final BaseItemDto parent;
-  final BaseItemDtoCallback? onDelete;
+  final BaseItemDtoCallback? onRemoveFromList;
   final bool showPlayCount;
 
   @override
@@ -176,10 +176,10 @@ class _SongsSliverListState extends State<SongsSliverList> {
             index: index + indexOffset,
             parentId: widget.parent.id,
             parentName: widget.parent.name,
-            onDelete: () {
+            onRemoveFromList: () {
               final item = removeItem();
-              if (widget.onDelete != null) {
-                widget.onDelete!(item);
+              if (widget.onRemoveFromList != null) {
+                widget.onRemoveFromList!(item);
               }
             },
             isInPlaylist: widget.parent.type == "Playlist",